Merge pull request #711 from CodinGame/lmn/fix-theme-color-synchronization

Fix theme color synchronization in firefox

Author: CGNonofr

src/contributions.ts

@@ -23,3 +23,4 @@ import 'vs/workbench/contrib/codeEditor/browser/editorFeatures'
 import 'vs/workbench/contrib/contextmenu/browser/contextmenu.contribution'
 import 'vs/workbench/browser/actions/textInputActions'
 import 'vs/workbench/browser/actions/developerActions'
+import 'vs/workbench/contrib/dropOrPasteInto/browser/dropOrPasteInto.contribution'

src/missing-services.ts

@@ -5159,6 +5159,7 @@ class LanguageModelToolsService implements ILanguageModelToolsService {
   registerToolData: ILanguageModelToolsService['registerToolData'] = () => Disposable.None
   registerToolImplementation: ILanguageModelToolsService['registerToolImplementation'] = () =>
     Disposable.None
+  registerTool: ILanguageModelToolsService['registerTool'] = () => Disposable.None
   getTools: ILanguageModelToolsService['getTools'] = () => []
   @Unsupported
   invokeTool: ILanguageModelToolsService['invokeTool'] = unsupported
@@ -5179,8 +5180,7 @@ class LanguageModelToolsService implements ILanguageModelToolsService {
   @Unsupported
   toToolAndToolSetEnablementMap: ILanguageModelToolsService['toToolAndToolSetEnablementMap'] =
     unsupported
-  @Unsupported
-  registerTool: ILanguageModelToolsService['registerTool'] = unsupported
+
   @Unsupported
   getToolAutoConfirmation: ILanguageModelToolsService['getToolAutoConfirmation'] = unsupported
 

src/service-override/textmate.ts

@@ -1,26 +1,11 @@
-import {
-  type IEditorOverrideServices,
-  StandaloneServices
-} from 'vs/editor/standalone/browser/standaloneServices'
+import { type IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices'
 import { ITextMateTokenizationService } from 'vs/workbench/services/textMate/browser/textMateTokenizationFeature.service'
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'
 import { TextMateTokenizationFeature } from 'vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl'
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle'
-import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle.service'
 import getFileServiceOverride from './files'
-import { registerServiceInitializeParticipant } from '../lifecycle'
 import 'vs/workbench/services/themes/common/tokenClassificationExtensionPoint'
 import 'vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens'
-
-registerServiceInitializeParticipant(async (accessor) => {
-  void accessor
-    .get(ILifecycleService)
-    .when(LifecyclePhase.Ready)
-    .then(() => {
-      // Force load the service
-      StandaloneServices.get(ITextMateTokenizationService)
-    })
-})
+import 'vs/workbench/services/textMate/browser/textMateTokenizationFeature.contribution'
 
 export default function getServiceOverride(): IEditorOverrideServices {
   return {

src/service-override/viewCommon.ts

@@ -65,6 +65,7 @@ import 'vs/workbench/contrib/files/browser/files.contribution._editorPane.js'
 import 'vs/workbench/contrib/files/browser/fileCommands._save.js'
 import 'vs/workbench/browser/actions/navigationActions'
 import 'vs/workbench/browser/style'
+import 'vs/workbench/contrib/scrollLocking/browser/scrollLocking.contribution'
 import './tools/editorAssets.js'
 
 // Import it from here to force the bundler to put it in this service-override package

vscode-patches/0073-fix-update-style-id-attribute-when-the-content-chang.patch

@@ -5,78 +5,19 @@ Subject: [PATCH] fix: update style id attribute when the content changes
 
 so it can be watched in firefox
 ---
- src/vs/base/browser/domStylesheets.ts         | 12 +++++++++-
- .../themes/browser/workbenchThemeService.ts   | 23 ++++++++++++-------
- 2 files changed, 26 insertions(+), 9 deletions(-)
+ src/vs/base/browser/domStylesheets.ts | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/vs/base/browser/domStylesheets.ts b/src/vs/base/browser/domStylesheets.ts
-index bb699646f05..3d935cf440b 100644
+index bb699646f05..dd89c88aa54 100644
 --- a/src/vs/base/browser/domStylesheets.ts
 +++ b/src/vs/base/browser/domStylesheets.ts
-@@ -6,6 +6,7 @@
- import { DisposableStore, toDisposable, IDisposable } from '../common/lifecycle.js';
- import { autorun, IObservable } from '../common/observable.js';
- import { createElement, getWindows, isShadowRoot, sharedMutationObserver } from './dom.js';
-+import { isFirefox } from './browser.js';
- import { mainWindow } from './window.js';
- 
- const globalStylesheets = new Map<HTMLStyleElement /* main stylesheet */, Set<HTMLStyleElement /* aux window clones that track the main stylesheet */>>();
-@@ -111,7 +112,16 @@ function cloneGlobalStyleSheet(globalStylesheet: HTMLStyleElement, globalStylesh
+@@ -111,7 +111,7 @@ function cloneGlobalStyleSheet(globalStylesheet: HTMLStyleElement, globalStylesh
  		clone.sheet?.insertRule(rule.cssText, clone.sheet?.cssRules.length);
  	}
 
 -	disposables.add(sharedMutationObserver.observe(globalStylesheet, disposables, { childList: true })(() => {
-+	let observeInit: MutationObserverInit = {
-+		childList: true
-+	};
-+	if (isFirefox) {
-+		// Firefox doesn't support observing style tag contents
-+		// As a workaround, also observe the data-version attribute that is updated when the content is updated
-+		observeInit = { ...observeInit, attributes: true, attributeFilter: ['data-version'] };
-+	}
-+
-+	disposables.add(sharedMutationObserver.observe(globalStylesheet, disposables, observeInit)(() => {
++	disposables.add(sharedMutationObserver.observe(globalStylesheet, disposables, { childList: true, subtree: true, characterData: true })(() => {
  		clone.textContent = globalStylesheet.textContent;
  	}));
 
-diff --git a/src/vs/workbench/services/themes/browser/workbenchThemeService.ts b/src/vs/workbench/services/themes/browser/workbenchThemeService.ts
-index a9dc7c145e0..1f1dc89e3a2 100644
---- a/src/vs/workbench/services/themes/browser/workbenchThemeService.ts
-+++ b/src/vs/workbench/services/themes/browser/workbenchThemeService.ts
-@@ -33,7 +33,7 @@ import { updateColorThemeConfigurationSchemas, updateFileIconThemeConfigurationS
- import { ProductIconThemeData, DEFAULT_PRODUCT_ICON_THEME_ID } from './productIconThemeData.js';
- import { registerProductIconThemeSchemas } from '../common/productIconThemeSchema.js';
- import { ILogService } from '../../../../platform/log/common/log.js';
--import { isWeb } from '../../../../base/common/platform.js';
-+import { isFirefox, isWeb } from '../../../../base/common/platform.js';
- import { ColorScheme, ThemeTypeSelector } from '../../../../platform/theme/common/theme.js';
- import { IHostColorSchemeService } from '../common/hostColorSchemeService.js';
- import { RunOnceScheduler, Sequencer } from '../../../../base/common/async.js';
-@@ -793,13 +793,20 @@ class ThemeFileWatcher {
- }
- 
- function _applyRules(styleSheetContent: string, rulesClassName: string) {
--	const themeStyles = mainWindow.document.head.querySelectorAll(`.${rulesClassName}`);
--	if (themeStyles.length === 0) {
--		const elStyle = createStyleSheet();
--		elStyle.className = rulesClassName;
--		elStyle.textContent = styleSheetContent;
--	} else {
--		(<HTMLStyleElement>themeStyles[0]).textContent = styleSheetContent;
-+	let themeStyle = mainWindow.document.head.querySelector(`.${rulesClassName}`);
-+	if (!themeStyle) {
-+		themeStyle = createStyleSheet();
-+		themeStyle.className = rulesClassName;
-+	}
-+
-+	if (themeStyle.textContent !== styleSheetContent) {
-+		themeStyle.textContent = styleSheetContent;
-+
-+		if (isFirefox) {
-+			// Firefox doesn't support observing style tag contents
-+			// As a workaround, also update the data-version attribute when it changes so it can be observed
-+			themeStyle.setAttribute('data-version', crypto.randomUUID());
-+		}
- 	}
- }
-