add setting for semantic highlighting

src/vs/editor/common/config/editorOptions.ts

@@ -1536,6 +1536,55 @@ class EditorHover extends BaseEditorOption<EditorOption.hover, EditorHoverOption
 
 //#endregion
 
+//#region semantic highlighting
+
+/**
+ * Configuration options for semantic highlighting
+ */
+export interface IEditorSemanticHighlightingOptions {
+	/**
+	 * Enable semantic highlighting.
+	 * Defaults to true.
+	 */
+	enabled?: boolean;
+}
+
+/**
+ * @internal
+ */
+export type EditorSemanticHighlightingOptions = Readonly<Required<IEditorSemanticHighlightingOptions>>;
+
+class EditorSemanticHighlighting extends BaseEditorOption<EditorOption.semanticHighlighting, EditorSemanticHighlightingOptions> {
+
+	constructor() {
+		const defaults: EditorSemanticHighlightingOptions = {
+			enabled: true
+		};
+		super(
+			EditorOption.semanticHighlighting, 'semanticHighlighting', defaults,
+			{
+				'editor.semanticHighlighting.enabled': {
+					type: 'boolean',
+					default: defaults.enabled,
+					description: nls.localize('semanticHighlighting.enabled', "Controls whether the semanticHighlighting is shown for the languages that support it.")
+				}
+			}
+		);
+	}
+
+	public validate(_input: any): EditorSemanticHighlightingOptions {
+		if (typeof _input !== 'object') {
+			return this.defaultValue;
+		}
+		const input = _input as IEditorSemanticHighlightingOptions;
+		return {
+			enabled: EditorBooleanOption.boolean(input.enabled, this.defaultValue.enabled)
+		};
+	}
+}
+
+//#endregion
+
 //#region layoutInfo
 
 /**
@@ -2823,7 +2872,7 @@ class EditorSuggest extends BaseEditorOption<EditorOption.suggest, InternalSugge
 					type: 'boolean',
 					default: true,
 					markdownDescription: nls.localize('editor.suggest.showSnippets', "When enabled IntelliSense shows `snippet`-suggestions.")
-				},
+				}
 			}
 		);
 	}
@@ -3133,6 +3182,7 @@ export const enum EditorOption {
 	selectionClipboard,
 	selectionHighlight,
 	selectOnLineNumbers,
+	semanticHighlighting,
 	showFoldingControls,
 	showUnused,
 	snippetSuggestions,
@@ -3561,6 +3611,7 @@ export const EditorOptions = {
 	selectOnLineNumbers: register(new EditorBooleanOption(
 		EditorOption.selectOnLineNumbers, 'selectOnLineNumbers', true,
 	)),
+	semanticHighlighting: register(new EditorSemanticHighlighting()),
 	showFoldingControls: register(new EditorStringEnumOption(
 		EditorOption.showFoldingControls, 'showFoldingControls',
 		'mouseover' as 'always' | 'mouseover',
@@ -3718,7 +3769,7 @@ export const EditorOptions = {
 	pixelRatio: register(new EditorPixelRatio()),
 	tabFocusMode: register(new EditorTabFocusMode()),
 	layoutInfo: register(new EditorLayoutInfoComputer()),
-	wrappingInfo: register(new EditorWrappingInfoComputer()),
+	wrappingInfo: register(new EditorWrappingInfoComputer())
 };
 
 /**

src/vs/editor/common/services/modelServiceImpl.ts

@@ -8,7 +8,7 @@ import { Disposable, IDisposable, DisposableStore } from 'vs/base/common/lifecyc
 import * as platform from 'vs/base/common/platform';
 import * as errors from 'vs/base/common/errors';
 import { URI } from 'vs/base/common/uri';
-import { EDITOR_MODEL_DEFAULTS } from 'vs/editor/common/config/editorOptions';
+import { EDITOR_MODEL_DEFAULTS, IEditorSemanticHighlightingOptions } from 'vs/editor/common/config/editorOptions';
 import { EditOperation } from 'vs/editor/common/core/editOperation';
 import { Range } from 'vs/editor/common/core/range';
 import { DefaultEndOfLine, EndOfLinePreference, EndOfLineSequence, IIdentifiedSingleEditOperation, ITextBuffer, ITextBufferFactory, ITextModel, ITextModelCreationOptions } from 'vs/editor/common/model';
@@ -133,7 +133,7 @@ export class ModelServiceImpl extends Disposable implements IModelService {
 		this._configurationServiceSubscription = this._configurationService.onDidChangeConfiguration(e => this._updateModelOptions());
 		this._updateModelOptions();
 
-		this._register(new SemanticColoringFeature(this, themeService, logService));
+		this._register(new SemanticColoringFeature(this, themeService, configurationService, logService));
 	}
 
 	private static _readModelOptions(config: IRawConfig, isForSimpleWidget: boolean): ITextModelCreationOptions {
@@ -442,20 +442,56 @@ export interface ILineSequence {
 }
 
 class SemanticColoringFeature extends Disposable {
+
+	private static readonly SETTING_ID = 'editor.semanticHighlighting';
+
 	private _watchers: Record<string, ModelSemanticColoring>;
 	private _semanticStyling: SemanticStyling;
+	private _configurationService: IConfigurationService;
 
-	constructor(modelService: IModelService, themeService: IThemeService, logService: ILogService) {
+	constructor(modelService: IModelService, themeService: IThemeService, configurationService: IConfigurationService, logService: ILogService) {
 		super();
+		this._configurationService = configurationService;
 		this._watchers = Object.create(null);
 		this._semanticStyling = this._register(new SemanticStyling(themeService, logService));
-		this._register(modelService.onModelAdded((model) => {
+
+		const isSemanticColoringEnabled = (model: ITextModel) => {
+			return configurationService.getValue<IEditorSemanticHighlightingOptions>(SemanticColoringFeature.SETTING_ID, { overrideIdentifier: model.getLanguageIdentifier().language, resource: model.uri }).enabled;
+		};
+		const register = (model: ITextModel) => {
 			this._watchers[model.uri.toString()] = new ModelSemanticColoring(model, themeService, this._semanticStyling);
+		};
+		const deregister = (model: ITextModel, modelSemanticColoring: ModelSemanticColoring) => {
+			modelSemanticColoring.dispose();
+			delete this._watchers[model.uri.toString()];
+		};
+		this._register(modelService.onModelAdded((model) => {
+			if (isSemanticColoringEnabled(model)) {
+				register(model);
+			}
 		}));
 		this._register(modelService.onModelRemoved((model) => {
-			this._watchers[model.uri.toString()].dispose();
-			delete this._watchers[model.uri.toString()];
+			const curr = this._watchers[model.uri.toString()];
+			if (curr) {
+				deregister(model, curr);
+			}
 		}));
+		this._configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(SemanticColoringFeature.SETTING_ID)) {
+				for (let model of modelService.getModels()) {
+					const curr = this._watchers[model.uri.toString()];
+					if (isSemanticColoringEnabled(model)) {
+						if (!curr) {
+							register(model);
+						}
+					} else {
+						if (curr) {
+							deregister(model, curr);
+						}
+					}
+				}
+			}
+		});
 	}
 }
 
@@ -685,7 +721,6 @@ class ModelSemanticColoring extends Disposable {
 	}
 
 	public dispose(): void {
-		this._isDisposed = true;
 		if (this._currentResponse) {
 			this._currentResponse.dispose();
 			this._currentResponse = null;
@@ -694,6 +729,9 @@ class ModelSemanticColoring extends Disposable {
 			this._currentRequestCancellationTokenSource.cancel();
 			this._currentRequestCancellationTokenSource = null;
 		}
+		this._setSemanticTokens(null, null, null, []);
+		this._isDisposed = true;
+
 		super.dispose();
 	}
 

src/vs/monaco.d.ts

@@ -3088,6 +3088,17 @@ declare namespace monaco.editor {
 		sticky?: boolean;
 	}
 
+	/**
+	 * Configuration options for semantic highlighting
+	 */
+	export interface IEditorSemanticHighlightingOptions {
+		/**
+		 * Enable semantic highlighting.
+		 * Defaults to true.
+		 */
+		enabled?: boolean;
+	}
+
 	/**
 	 * A description for the overview ruler position.
 	 */