Fix converter

octref · octref · commit 999af5dc9131 · 2020-01-21T10:29:53.000+01:00
diff --git a/src/vs/workbench/api/common/extHostTypeConverters.ts b/src/vs/workbench/api/common/extHostTypeConverters.ts
@@ -849,7 +849,10 @@ export namespace CompletionItem {
 	export function to(suggestion: modes.CompletionItem, converter?: CommandsConverter): types.CompletionItem {
 
 		const result = new types.CompletionItem(typeof suggestion.label === 'string' ? suggestion.label : suggestion.label.name);
-		result.label2 = suggestion.label;
+		if (typeof suggestion.label !== 'string') {
+			result.label2 = suggestion.label;
+		}
+
 		result.insertText = suggestion.insertText;
 		result.kind = CompletionItemKind.to(suggestion.kind);
 		result.tags = suggestion.tags && suggestion.tags.map(CompletionItemTag.to);
diff --git a/src/vs/workbench/api/common/extHostTypes.ts b/src/vs/workbench/api/common/extHostTypes.ts
@@ -1386,7 +1386,6 @@ export class CompletionItem implements vscode.CompletionItem {
 
 	constructor(label: string, kind?: CompletionItemKind) {
 		this.label = label;
-		this.label2 = { name: label };
 		this.kind = kind;
 	}
 
diff --git a/src/vs/workbench/test/electron-browser/api/extHostTypes.test.ts b/src/vs/workbench/test/electron-browser/api/extHostTypes.test.ts
@@ -451,11 +451,11 @@ suite('ExtHostTypes', function () {
 			command: { command: 'id', title: 'title' }
 		});
 
-		assertToJSON(new types.CompletionItem('complete'), { label: 'complete', label2: { name: 'complete' } });
+		assertToJSON(new types.CompletionItem('complete'), { label: 'complete' });
 
 		let item = new types.CompletionItem('complete');
 		item.kind = types.CompletionItemKind.Interface;
-		assertToJSON(item, { label: 'complete', label2: { name: 'complete' }, kind: 'Interface' });
+		assertToJSON(item, { label: 'complete', kind: 'Interface' });
 
 	});
 

Original file line number	Diff line number	Diff line change
`@@ -1386,7 +1386,6 @@ export class CompletionItem implements vscode.CompletionItem {`
`1386`	`1386`
`1387`	`1387`	`constructor(label: string, kind?: CompletionItemKind) {`
`1388`	`1388`	`this.label = label;`
`1389`		`- this.label2 = { name: label };`
`1390`	`1389`	`this.kind = kind;`
`1391`	`1390`	`}`
`1392`	`1391`