Merge pull request microsoft#95830 from dustypomerleau/hl

alexdima · web-flow · commit 73b5307ae2a3 · 2020-04-27T10:26:52.000+02:00
change all instances of `wordHighligher` to `wordHighlighter`
diff --git a/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts b/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts
@@ -483,55 +483,55 @@ class WordHighlighterContribution extends Disposable implements IEditorContribut
 		return editor.getContribution<WordHighlighterContribution>(WordHighlighterContribution.ID);
 	}
 
-	private wordHighligher: WordHighlighter | null;
+	private wordHighlighter: WordHighlighter | null;
 
 	constructor(editor: ICodeEditor, @IContextKeyService contextKeyService: IContextKeyService) {
 		super();
-		this.wordHighligher = null;
+		this.wordHighlighter = null;
 		const createWordHighlighterIfPossible = () => {
 			if (editor.hasModel()) {
-				this.wordHighligher = new WordHighlighter(editor, contextKeyService);
+				this.wordHighlighter = new WordHighlighter(editor, contextKeyService);
 			}
 		};
 		this._register(editor.onDidChangeModel((e) => {
-			if (this.wordHighligher) {
-				this.wordHighligher.dispose();
-				this.wordHighligher = null;
+			if (this.wordHighlighter) {
+				this.wordHighlighter.dispose();
+				this.wordHighlighter = null;
 			}
 			createWordHighlighterIfPossible();
 		}));
 		createWordHighlighterIfPossible();
 	}
 
 	public saveViewState(): boolean {
-		if (this.wordHighligher && this.wordHighligher.hasDecorations()) {
+		if (this.wordHighlighter && this.wordHighlighter.hasDecorations()) {
 			return true;
 		}
 		return false;
 	}
 
 	public moveNext() {
-		if (this.wordHighligher) {
-			this.wordHighligher.moveNext();
+		if (this.wordHighlighter) {
+			this.wordHighlighter.moveNext();
 		}
 	}
 
 	public moveBack() {
-		if (this.wordHighligher) {
-			this.wordHighligher.moveBack();
+		if (this.wordHighlighter) {
+			this.wordHighlighter.moveBack();
 		}
 	}
 
 	public restoreViewState(state: boolean | undefined): void {
-		if (this.wordHighligher && state) {
-			this.wordHighligher.restore();
+		if (this.wordHighlighter && state) {
+			this.wordHighlighter.restore();
 		}
 	}
 
 	public dispose(): void {
-		if (this.wordHighligher) {
-			this.wordHighligher.dispose();
-			this.wordHighligher = null;
+		if (this.wordHighlighter) {
+			this.wordHighlighter.dispose();
+			this.wordHighlighter = null;
 		}
 		super.dispose();
 	}

Original file line number	Diff line number	Diff line change
`@@ -483,55 +483,55 @@ class WordHighlighterContribution extends Disposable implements IEditorContribut`
`483`	`483`	`return editor.getContribution<WordHighlighterContribution>(WordHighlighterContribution.ID);`
`484`	`484`	`}`
`485`	`485`
`486`		`- private wordHighligher: WordHighlighter \| null;`
	`486`	`+ private wordHighlighter: WordHighlighter \| null;`
`487`	`487`
`488`	`488`	`constructor(editor: ICodeEditor, @IContextKeyService contextKeyService: IContextKeyService) {`
`489`	`489`	`super();`
`490`		`- this.wordHighligher = null;`
	`490`	`+ this.wordHighlighter = null;`
`491`	`491`	`const createWordHighlighterIfPossible = () => {`
`492`	`492`	`if (editor.hasModel()) {`
`493`		`- this.wordHighligher = new WordHighlighter(editor, contextKeyService);`
	`493`	`+ this.wordHighlighter = new WordHighlighter(editor, contextKeyService);`
`494`	`494`	`}`
`495`	`495`	`};`
`496`	`496`	`this._register(editor.onDidChangeModel((e) => {`
`497`		`- if (this.wordHighligher) {`
`498`		`- this.wordHighligher.dispose();`
`499`		`- this.wordHighligher = null;`
	`497`	`+ if (this.wordHighlighter) {`
	`498`	`+ this.wordHighlighter.dispose();`
	`499`	`+ this.wordHighlighter = null;`
`500`	`500`	`}`
`501`	`501`	`createWordHighlighterIfPossible();`
`502`	`502`	`}));`
`503`	`503`	`createWordHighlighterIfPossible();`
`504`	`504`	`}`
`505`	`505`
`506`	`506`	`public saveViewState(): boolean {`
`507`		`- if (this.wordHighligher && this.wordHighligher.hasDecorations()) {`
	`507`	`+ if (this.wordHighlighter && this.wordHighlighter.hasDecorations()) {`
`508`	`508`	`return true;`
`509`	`509`	`}`
`510`	`510`	`return false;`
`511`	`511`	`}`
`512`	`512`
`513`	`513`	`public moveNext() {`
`514`		`- if (this.wordHighligher) {`
`515`		`- this.wordHighligher.moveNext();`
	`514`	`+ if (this.wordHighlighter) {`
	`515`	`+ this.wordHighlighter.moveNext();`
`516`	`516`	`}`
`517`	`517`	`}`
`518`	`518`
`519`	`519`	`public moveBack() {`
`520`		`- if (this.wordHighligher) {`
`521`		`- this.wordHighligher.moveBack();`
	`520`	`+ if (this.wordHighlighter) {`
	`521`	`+ this.wordHighlighter.moveBack();`
`522`	`522`	`}`
`523`	`523`	`}`
`524`	`524`
`525`	`525`	`public restoreViewState(state: boolean \| undefined): void {`
`526`		`- if (this.wordHighligher && state) {`
`527`		`- this.wordHighligher.restore();`
	`526`	`+ if (this.wordHighlighter && state) {`
	`527`	`+ this.wordHighlighter.restore();`
`528`	`528`	`}`
`529`	`529`	`}`
`530`	`530`
`531`	`531`	`public dispose(): void {`
`532`		`- if (this.wordHighligher) {`
`533`		`- this.wordHighligher.dispose();`
`534`		`- this.wordHighligher = null;`
	`532`	`+ if (this.wordHighlighter) {`
	`533`	`+ this.wordHighlighter.dispose();`
	`534`	`+ this.wordHighlighter = null;`
`535`	`535`	`}`
`536`	`536`	`super.dispose();`
`537`	`537`	`}`