Have SemanticTokensBuilder.build() return SemanticTokens (for microsoft#93614)

alexdima · alexdima · commit 65309e1d7cf9 · 2020-03-30T15:52:25.000+02:00
diff --git a/extensions/typescript-language-features/src/features/semanticTokens.ts b/extensions/typescript-language-features/src/features/semanticTokens.ts
@@ -117,7 +117,7 @@ class DocumentSemanticTokensProvider implements vscode.DocumentSemanticTokensPro
 				builder.push(line, startCharacter, endCharacter - startCharacter, tokenType, tokenModifiers);
 			}
 		}
-		return new vscode.SemanticTokens(builder.build());
+		return builder.build();
 	}
 }
 
diff --git a/extensions/vscode-colorize-tests/src/colorizerTestMain.ts b/extensions/vscode-colorize-tests/src/colorizerTestMain.ts
@@ -56,7 +56,7 @@ export function activate(context: vscode.ExtensionContext): any {
 			};
 			jsoncParser.visit(document.getText(), visitor);
 
-			return new vscode.SemanticTokens(builder.build());
+			return builder.build();
 		}
 	};
 
diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts
@@ -259,7 +259,7 @@ declare module 'vscode' {
 	export class SemanticTokensBuilder {
 		constructor();
 		push(line: number, char: number, length: number, tokenType: number, tokenModifiers: number): void;
-		build(): Uint32Array;
+		build(resultId?: string): SemanticTokens;
 	}
 
 	export class SemanticTokens {
diff --git a/src/vs/workbench/api/common/extHostTypes.ts b/src/vs/workbench/api/common/extHostTypes.ts
@@ -2462,8 +2462,8 @@ export class SemanticTokensBuilder {
 		this._prevChar = char;
 	}
 
-	public build(): Uint32Array {
-		return new Uint32Array(this._data);
+	public build(resultId?: string): SemanticTokens {
+		return new SemanticTokens(new Uint32Array(this._data), resultId);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ class DocumentSemanticTokensProvider implements vscode.DocumentSemanticTokensPro`
`117`	`117`	`builder.push(line, startCharacter, endCharacter - startCharacter, tokenType, tokenModifiers);`
`118`	`118`	`}`
`119`	`119`	`}`
`120`		`- return new vscode.SemanticTokens(builder.build());`
	`120`	`+ return builder.build();`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ export function activate(context: vscode.ExtensionContext): any {`
`56`	`56`	`};`
`57`	`57`	`jsoncParser.visit(document.getText(), visitor);`
`58`	`58`
`59`		`- return new vscode.SemanticTokens(builder.build());`
	`59`	`+ return builder.build();`
`60`	`60`	`}`
`61`	`61`	`};`
`62`	`62`
Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ declare module 'vscode' {`
`259`	`259`	`export class SemanticTokensBuilder {`
`260`	`260`	`constructor();`
`261`	`261`	`push(line: number, char: number, length: number, tokenType: number, tokenModifiers: number): void;`
`262`		`- build(): Uint32Array;`
	`262`	`+ build(resultId?: string): SemanticTokens;`
`263`	`263`	`}`
`264`	`264`
`265`	`265`	`export class SemanticTokens {`
Original file line number	Diff line number	Diff line change
`@@ -2462,8 +2462,8 @@ export class SemanticTokensBuilder {`
`2462`	`2462`	`this._prevChar = char;`
`2463`	`2463`	`}`
`2464`	`2464`
`2465`		`- public build(): Uint32Array {`
`2466`		`- return new Uint32Array(this._data);`
	`2465`	`+ public build(resultId?: string): SemanticTokens {`
	`2466`	`+ return new SemanticTokens(new Uint32Array(this._data), resultId);`
`2467`	`2467`	`}`
`2468`	`2468`	`}`
`2469`	`2469`