Merge branch 'lszomoru/extensionSupportCompletionProvider'

extensions/configuration-editing/src/settingsDocumentHelper.ts

@@ -6,7 +6,7 @@
 import * as vscode from 'vscode';
 import { getLocation, Location, parse } from 'jsonc-parser';
 import * as nls from 'vscode-nls';
-import { provideInstalledExtensionProposals, provideWorkspaceTrustExtensionProposals } from './extensionsProposals';
+import { provideInstalledExtensionProposals } from './extensionsProposals';
 
 const localize = nls.loadMessageBundle();
 
@@ -60,15 +60,6 @@ export class SettingsDocument {
 			return provideInstalledExtensionProposals(alreadyConfigured, `: [\n\t"ui"\n]`, range, true);
 		}
 
-		// extensions.supportUntrustedWorkspaces
-		if (location.path[0] === 'extensions.supportUntrustedWorkspaces' && location.path.length === 2 && location.isAtPropertyKey) {
-			let alreadyConfigured: string[] = [];
-			try {
-				alreadyConfigured = Object.keys(parse(this.document.getText())['extensions.supportUntrustedWorkspaces']);
-			} catch (e) {/* ignore error */ }
-			return provideWorkspaceTrustExtensionProposals(alreadyConfigured, range);
-		}
-
 		return this.provideLanguageOverridesCompletionItems(location, position);
 	}
 

src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts

@@ -72,6 +72,7 @@ import { Query } from 'vs/workbench/contrib/extensions/common/extensionQuery';
 import { Promises } from 'vs/base/common/async';
 import { EditorExtensions } from 'vs/workbench/common/editor';
 import { WORKSPACE_TRUST_EXTENSION_SUPPORT } from 'vs/workbench/services/workspaces/common/workspaceTrust';
+import { ExtensionsCompletionItemsProvider } from 'vs/workbench/contrib/extensions/browser/extensionsCompletionItemsProvider';
 
 // Singletons
 registerSingleton(IExtensionsWorkbenchService, ExtensionsWorkbenchService);
@@ -1326,6 +1327,7 @@ workbenchRegistry.registerWorkbenchContribution(ExtensionsViewletViewsContributi
 workbenchRegistry.registerWorkbenchContribution(ExtensionActivationProgress, LifecyclePhase.Eventually);
 workbenchRegistry.registerWorkbenchContribution(ExtensionDependencyChecker, LifecyclePhase.Eventually);
 workbenchRegistry.registerWorkbenchContribution(ExtensionEnablementByWorkspaceTrustRequirement, LifecyclePhase.Restored);
+workbenchRegistry.registerWorkbenchContribution(ExtensionsCompletionItemsProvider, LifecyclePhase.Restored);
 
 // Running Extensions
 const actionRegistry = Registry.as<IWorkbenchActionRegistry>(WorkbenchActionExtensions.WorkbenchActions);

src/vs/workbench/contrib/extensions/browser/extensionsCompletionItemsProvider.ts

+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { localize } from 'vs/nls';
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { getLocation, parse } from 'vs/base/common/json';
+import { Disposable } from 'vs/base/common/lifecycle';
+import { Position } from 'vs/editor/common/core/position';
+import { ITextModel } from 'vs/editor/common/model';
+import { CompletionContext, CompletionList, CompletionProviderRegistry, CompletionItemKind, CompletionItem } from 'vs/editor/common/modes';
+import { IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
+import { Range } from 'vs/editor/common/core/range';
+
+
+export class ExtensionsCompletionItemsProvider extends Disposable implements IWorkbenchContribution {
+	constructor(
+		@IExtensionManagementService private readonly extensionManagementService: IExtensionManagementService,
+	) {
+		super();
+
+		this._register(CompletionProviderRegistry.register({ language: 'jsonc', pattern: '**/settings.json' }, {
+			provideCompletionItems: async (model: ITextModel, position: Position, _context: CompletionContext, token: CancellationToken): Promise<CompletionList> => {
+				const getWordRangeAtPosition = (model: ITextModel, position: Position): Range | null => {
+					const wordAtPosition = model.getWordAtPosition(position);
+					return wordAtPosition ? new Range(position.lineNumber, wordAtPosition.startColumn, position.lineNumber, wordAtPosition.endColumn) : null;
+				};
+
+				const location = getLocation(model.getValue(), model.getOffsetAt(position));
+				const range = getWordRangeAtPosition(model, position) ?? Range.fromPositions(position, position);
+
+				// extensions.supportUntrustedWorkspaces
+				if (location.path[0] === 'extensions.supportUntrustedWorkspaces' && location.path.length === 2 && location.isAtPropertyKey) {
+					let alreadyConfigured: string[] = [];
+					try {
+						alreadyConfigured = Object.keys(parse(model.getValue())['extensions.supportUntrustedWorkspaces']);
+					} catch (e) {/* ignore error */ }
+
+					return { suggestions: await this.provideSupportUntrustedWorkspacesExtensionProposals(alreadyConfigured, range) };
+				}
+
+				return { suggestions: [] };
+			}
+		}));
+	}
+
+	private async provideSupportUntrustedWorkspacesExtensionProposals(alreadyConfigured: string[], range: Range): Promise<CompletionItem[]> {
+		const suggestions: CompletionItem[] = [];
+		const installedExtensions = (await this.extensionManagementService.getInstalled()).filter(e => e.manifest.main);
+		const proposedExtensions = installedExtensions.filter(e => alreadyConfigured.indexOf(e.identifier.id) === -1);
+
+		if (proposedExtensions.length) {
+			suggestions.push(...proposedExtensions.map(e => {
+				const text = `"${e.identifier.id}": {\n\t"supported": true,\n\t"version": "${e.manifest.version}"\n},`;
+				return { label: e.identifier.id, kind: CompletionItemKind.Value, insertText: text, filterText: text, range };
+			}));
+		} else {
+			const text = '"vscode.csharp": {\n\t"supported": true,\n\t"version": "0.0.0"\n},';
+			suggestions.push({ label: localize('exampleExtension', "Example"), kind: CompletionItemKind.Value, insertText: text, filterText: text, range });
+		}
+
+		return suggestions;
+	}
+}