protect against bad results, #11455

microsoft · Sep 19, 2016 · ec8f8da · ec8f8da
1 parent 0c4759a
commit ec8f8da
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/vs/workbench/api/node/mainThreadLanguageFeatures.ts b/src/vs/workbench/api/node/mainThreadLanguageFeatures.ts
@@ -156,8 +156,10 @@ export class MainThreadLanguageFeatures extends MainThreadLanguageFeaturesShape
 		this._registrations[handle] = WorkspaceSymbolProviderRegistry.register(<IWorkspaceSymbolProvider>{
 			provideWorkspaceSymbols: (search: string): TPromise<IWorkspaceSymbol[]> => {
 				return this._proxy.$provideWorkspaceSymbols(handle, search).then(result => {
-					for (const item of result) {
-						trackGarbageCollection(item, ObjectIdentifier.get(item));
+					if (result) {
+						for (const item of result) {
+							trackGarbageCollection(item, ObjectIdentifier.get(item));
+						}
 					}
 					return result;
 				});
@@ -187,8 +189,10 @@ export class MainThreadLanguageFeatures extends MainThreadLanguageFeaturesShape
 			triggerCharacters: triggerCharacters,
 			provideCompletionItems: (model:IReadOnlyModel, position:EditorPosition, token:CancellationToken): Thenable<modes.ISuggestResult> => {
 				return wireCancellationToken(token, this._proxy.$provideCompletionItems(handle, model.uri, position)).then(result => {
-					for (const suggestion of result.suggestions) {
-						trackGarbageCollection(suggestion, ObjectIdentifier.get(suggestion));
+					if (result && result.suggestions) {
+						for (const suggestion of result.suggestions) {
+							trackGarbageCollection(suggestion, ObjectIdentifier.get(suggestion));
+						}
 					}
 					return result;
 				});