Revert "Converting a few functions in ITokenizationRegistry to return undefined instead of null"

alexdima · alexdima · commit 76be8205334d · 2019-10-18T15:41:38.000+02:00
This reverts commit 4a461d2. Revert "null -> undefined" This reverts commit 30dc021
diff --git a/src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.ts b/src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.ts
@@ -61,8 +61,8 @@ class Settings {
 		const minimapOpts = options.get(EditorOption.minimap);
 		const minimapEnabled = minimapOpts.enabled;
 		const minimapSide = minimapOpts.side;
-		const backgroundColor = (minimapEnabled ? TokenizationRegistry.getDefaultBackground() : undefined);
-		if (typeof backgroundColor === 'undefined' || minimapSide === 'left') {
+		const backgroundColor = (minimapEnabled ? TokenizationRegistry.getDefaultBackground() : null);
+		if (backgroundColor === null || minimapSide === 'left') {
 			this.backgroundColor = null;
 		} else {
 			this.backgroundColor = Color.Format.CSS.formatHex(backgroundColor);
diff --git a/src/vs/editor/common/model/textModelTokens.ts b/src/vs/editor/common/model/textModelTokens.ts
@@ -198,13 +198,14 @@ export class TextModelTokenization extends Disposable {
 	private readonly _textModel: TextModel;
 	private readonly _tokenizationStateStore: TokenizationStateStore;
 	private _isDisposed: boolean;
-	private _tokenizationSupport: ITokenizationSupport | undefined;
+	private _tokenizationSupport: ITokenizationSupport | null;
 
 	constructor(textModel: TextModel) {
 		super();
 		this._isDisposed = false;
 		this._textModel = textModel;
 		this._tokenizationStateStore = new TokenizationStateStore();
+		this._tokenizationSupport = null;
 
 		this._register(TokenizationRegistry.onDidChange((e) => {
 			const languageIdentifier = this._textModel.getLanguageIdentifier();
@@ -423,11 +424,11 @@ export class TextModelTokenization extends Disposable {
 	}
 }
 
-function initializeTokenization(textModel: TextModel): [ITokenizationSupport | undefined, IState | null] {
+function initializeTokenization(textModel: TextModel): [ITokenizationSupport | null, IState | null] {
 	const languageIdentifier = textModel.getLanguageIdentifier();
 	let tokenizationSupport = (
 		textModel.isTooLargeForTokenization()
-			? undefined
+			? null
 			: TokenizationRegistry.get(languageIdentifier.language)
 	);
 	let initialState: IState | null = null;
@@ -436,7 +437,7 @@ function initializeTokenization(textModel: TextModel): [ITokenizationSupport | u
 			initialState = tokenizationSupport.getInitialState();
 		} catch (e) {
 			onUnexpectedError(e);
-			tokenizationSupport = undefined;
+			tokenizationSupport = null;
 		}
 	}
 	return [tokenizationSupport, initialState];
diff --git a/src/vs/editor/common/modes.ts b/src/vs/editor/common/modes.ts
@@ -1617,9 +1617,9 @@ export interface ITokenizationRegistry {
 
 	/**
 	 * Get the tokenization support for a language.
-	 * Returns `undefined` if not found.
+	 * Returns `null` if not found.
 	 */
-	get(language: string): ITokenizationSupport | undefined;
+	get(language: string): ITokenizationSupport | null;
 
 	/**
 	 * Get the promise of a tokenization support for a language.
@@ -1632,9 +1632,9 @@ export interface ITokenizationRegistry {
 	 */
 	setColorMap(colorMap: Color[]): void;
 
-	getColorMap(): Color[] | undefined;
+	getColorMap(): Color[] | null;
 
-	getDefaultBackground(): Color | undefined;
+	getDefaultBackground(): Color | null;
 }
 
 /**
diff --git a/src/vs/editor/common/modes/tokenizationRegistry.ts b/src/vs/editor/common/modes/tokenizationRegistry.ts
@@ -7,6 +7,7 @@ import { Color } from 'vs/base/common/color';
 import { Emitter, Event } from 'vs/base/common/event';
 import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { ColorId, ITokenizationRegistry, ITokenizationSupport, ITokenizationSupportChangedEvent } from 'vs/editor/common/modes';
+import { withUndefinedAsNull } from 'vs/base/common/types';
 import { keys } from 'vs/base/common/map';
 
 export class TokenizationRegistryImpl implements ITokenizationRegistry {
@@ -17,7 +18,11 @@ export class TokenizationRegistryImpl implements ITokenizationRegistry {
 	private readonly _onDidChange = new Emitter<ITokenizationSupportChangedEvent>();
 	public readonly onDidChange: Event<ITokenizationSupportChangedEvent> = this._onDidChange.event;
 
-	private _colorMap: Color[] | undefined;
+	private _colorMap: Color[] | null;
+
+	constructor() {
+		this._colorMap = null;
+	}
 
 	public fire(languages: string[]): void {
 		this._onDidChange.fire({
@@ -71,8 +76,8 @@ export class TokenizationRegistryImpl implements ITokenizationRegistry {
 		return null;
 	}
 
-	public get(language: string): ITokenizationSupport | undefined {
-		return this._map.get(language);
+	public get(language: string): ITokenizationSupport | null {
+		return withUndefinedAsNull(this._map.get(language));
 	}
 
 	public setColorMap(colorMap: Color[]): void {
@@ -83,14 +88,14 @@ export class TokenizationRegistryImpl implements ITokenizationRegistry {
 		});
 	}
 
-	public getColorMap(): Color[] | undefined {
+	public getColorMap(): Color[] | null {
 		return this._colorMap;
 	}
 
-	public getDefaultBackground(): Color | undefined {
+	public getDefaultBackground(): Color | null {
 		if (this._colorMap && this._colorMap.length > ColorId.DefaultBackground) {
 			return this._colorMap[ColorId.DefaultBackground];
 		}
-		return undefined;
+		return null;
 	}
 }
