Merge branch 'master' into rebornix/listitemwithoutheight

.vscode/launch.json

@@ -16,7 +16,6 @@
 			"request": "attach",
 			"name": "Attach to Extension Host",
 			"port": 5870,
-			"restart": true,
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
 			]

.vscode/tasks.json

@@ -31,20 +31,6 @@
 				}
 			}
 		},
-		{
-			"type": "npm",
-			"script": "strict-function-types-watch",
-			"label": "TS - Strict Function Types",
-			"isBackground": true,
-			"presentation": {
-				"reveal": "never"
-			},
-			"problemMatcher": {
-				"base": "$tsc-watch",
-				"owner": "typescript-function-types",
-				"applyTo": "allDocuments"
-			}
-		},
 		{
 			"label": "Run tests",
 			"type": "shell",

README.md

@@ -44,7 +44,7 @@ please see the document [How to Contribute](https://github.com/Microsoft/vscode/
 
 * Ask a question on [Stack Overflow](https://stackoverflow.com/questions/tagged/vscode)
 * [Request a new feature](CONTRIBUTING.md)
-* Up vote [popular feature requests](https://github.com/Microsoft/vscode/issues?q=is%3Aopen+is%3Aissue+label%3Afeature-request+sort%3Areactions-%2B1-desc)
+* Upvote [popular feature requests](https://github.com/Microsoft/vscode/issues?q=is%3Aopen+is%3Aissue+label%3Afeature-request+sort%3Areactions-%2B1-desc)
 * [File an issue](https://github.com/Microsoft/vscode/issues)
 * Follow [@code](https://twitter.com/code) and let us know what you think!
 

build/azure-pipelines/darwin/product-build-darwin.yml

@@ -207,7 +207,7 @@ steps:
           "toolVersion": "1.0"
         }
       ]
-    SessionTimeout: 120
+    SessionTimeout: 60
   displayName: Notarization
 
 - script: |

build/builtInExtensions.json

@@ -46,7 +46,7 @@
 	},
 	{
 		"name": "ms-vscode.js-debug-nightly",
-		"version": "2020.2.1117",
+		"version": "2020.2.1417",
 		"forQualities": [
 			"insider"
 		],

extensions/configuration-editing/src/extension.ts

@@ -7,6 +7,7 @@ import { getLocation, parse, visit } from 'jsonc-parser';
 import * as vscode from 'vscode';
 import * as nls from 'vscode-nls';
 import { SettingsDocument } from './settingsDocumentHelper';
+import { provideInstalledExtensionProposals } from './extensionsProposals';
 const localize = nls.loadMessageBundle();
 
 export function activate(context: vscode.ExtensionContext): void {
@@ -80,7 +81,7 @@ function registerExtensionsCompletionsInExtensionsDocument(): vscode.Disposable
 			const range = document.getWordRangeAtPosition(position) || new vscode.Range(position, position);
 			if (location.path[0] === 'recommendations') {
 				const extensionsContent = <IExtensionsContent>parse(document.getText());
-				return provideInstalledExtensionProposals(extensionsContent, range);
+				return provideInstalledExtensionProposals(extensionsContent && extensionsContent.recommendations || [], range, false);
 			}
 			return [];
 		}
@@ -94,41 +95,13 @@ function registerExtensionsCompletionsInWorkspaceConfigurationDocument(): vscode
 			const range = document.getWordRangeAtPosition(position) || new vscode.Range(position, position);
 			if (location.path[0] === 'extensions' && location.path[1] === 'recommendations') {
 				const extensionsContent = <IExtensionsContent>parse(document.getText())['extensions'];
-				return provideInstalledExtensionProposals(extensionsContent, range);
+				return provideInstalledExtensionProposals(extensionsContent && extensionsContent.recommendations || [], range, false);
 			}
 			return [];
 		}
 	});
 }
 
-function provideInstalledExtensionProposals(extensionsContent: IExtensionsContent, range: vscode.Range): vscode.ProviderResult<vscode.CompletionItem[] | vscode.CompletionList> {
-	const alreadyEnteredExtensions = extensionsContent && extensionsContent.recommendations || [];
-	if (Array.isArray(alreadyEnteredExtensions)) {
-		const knownExtensionProposals = vscode.extensions.all.filter(e =>
-			!(e.id.startsWith('vscode.')
-				|| e.id === 'Microsoft.vscode-markdown'
-				|| alreadyEnteredExtensions.indexOf(e.id) > -1));
-		if (knownExtensionProposals.length) {
-			return knownExtensionProposals.map(e => {
-				const item = new vscode.CompletionItem(e.id);
-				const insertText = `"${e.id}"`;
-				item.kind = vscode.CompletionItemKind.Value;
-				item.insertText = insertText;
-				item.range = range;
-				item.filterText = insertText;
-				return item;
-			});
-		} else {
-			const example = new vscode.CompletionItem(localize('exampleExtension', "Example"));
-			example.insertText = '"vscode.csharp"';
-			example.kind = vscode.CompletionItemKind.Value;
-			example.range = range;
-			return [example];
-		}
-	}
-	return undefined;
-}
-
 vscode.languages.registerDocumentSymbolProvider({ pattern: '**/launch.json', language: 'jsonc' }, {
 	provideDocumentSymbols(document: vscode.TextDocument, _token: vscode.CancellationToken): vscode.ProviderResult<vscode.SymbolInformation[]> {
 		const result: vscode.SymbolInformation[] = [];

extensions/configuration-editing/src/extensionsProposals.ts

@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import * as nls from 'vscode-nls';
+const localize = nls.loadMessageBundle();
+
+
+export function provideInstalledExtensionProposals(existing: string[], range: vscode.Range, includeBuiltinExtensions: boolean): vscode.ProviderResult<vscode.CompletionItem[] | vscode.CompletionList> {
+	if (Array.isArray(existing)) {
+		const extensions = includeBuiltinExtensions ? vscode.extensions.all : vscode.extensions.all.filter(e => !(e.id.startsWith('vscode.') || e.id === 'Microsoft.vscode-markdown'));
+		const knownExtensionProposals = extensions.filter(e => existing.indexOf(e.id) === -1);
+		if (knownExtensionProposals.length) {
+			return knownExtensionProposals.map(e => {
+				const item = new vscode.CompletionItem(e.id);
+				const insertText = `"${e.id}"`;
+				item.kind = vscode.CompletionItemKind.Value;
+				item.insertText = insertText;
+				item.range = range;
+				item.filterText = insertText;
+				return item;
+			});
+		} else {
+			const example = new vscode.CompletionItem(localize('exampleExtension', "Example"));
+			example.insertText = '"vscode.csharp"';
+			example.kind = vscode.CompletionItemKind.Value;
+			example.range = range;
+			return [example];
+		}
+	}
+	return undefined;
+}
+

extensions/configuration-editing/src/settingsDocumentHelper.ts

@@ -4,16 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { getLocation, Location } from 'jsonc-parser';
+import { getLocation, Location, parse } from 'jsonc-parser';
 import * as nls from 'vscode-nls';
+import { provideInstalledExtensionProposals } from './extensionsProposals';
 
 const localize = nls.loadMessageBundle();
 
 export class SettingsDocument {
 
 	constructor(private document: vscode.TextDocument) { }
 
-	public provideCompletionItems(position: vscode.Position, _token: vscode.CancellationToken): vscode.ProviderResult<vscode.CompletionItem[]> {
+	public provideCompletionItems(position: vscode.Position, _token: vscode.CancellationToken): vscode.ProviderResult<vscode.CompletionItem[] | vscode.CompletionList> {
 		const location = getLocation(this.document.getText(), this.document.offsetAt(position));
 		const range = this.document.getWordRangeAtPosition(position) || new vscode.Range(position, position);
 
@@ -41,6 +42,15 @@ export class SettingsDocument {
 			});
 		}
 
+		// sync.ignoredExtensions
+		if (location.path[0] === 'sync.ignoredExtensions') {
+			let ignoredExtensions = [];
+			try {
+				ignoredExtensions = parse(this.document.getText())['sync.ignoredExtensions'];
+			} catch (e) {/* ignore error */ }
+			return provideInstalledExtensionProposals(ignoredExtensions, range, true);
+		}
+
 		return this.provideLanguageOverridesCompletionItems(location, position);
 	}