Merge branch 'master' into master

.github/copycat.yml

@@ -1,5 +1,5 @@
 {
-    perform: false,
+    perform: true,
     target_owner: 'chrmarti',
     target_repo: 'testissues'
 }

.github/feature-requests.yml

@@ -0,0 +1,34 @@
+{
+  typeLabel: {
+    name: 'feature-request'
+  },
+  candidateMilestone: {
+    number: 107,
+    name: 'Backlog Candidates'
+  },
+  approvedMilestone: {
+    number: 8,
+    name: 'Backlog'
+  },
+  onLabeled: {
+    delay: 60,
+    perform: true
+  },
+  onCandidateMilestoned: {
+    candidatesComment: "This feature request is now a candidate for our backlog. The community has 60 days to upvote the issue. If it receives 20 upvotes we will move it to our backlog. If not, we will close it. To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding!",
+    perform: true
+  },
+  onMonitorUpvotes: {
+    upvoteThreshold: 20,
+    acceptanceComment: ":slightly_smiling_face: This feature request received a sufficient number of community upvotes and we moved it to our backlog. To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding!",
+    perform: true
+  },
+  onMonitorDaysOnCandidateMilestone: {
+    daysOnMilestone: 60,
+    warningPeriod: 10,
+    numberOfCommentsToPreventAutomaticRejection: 20,
+    rejectionComment: ":slightly_frowning_face: In the last 60 days, this feature request has received less than 20 community upvotes and we closed it. Still a big Thank You to you for taking the time to create this issue! To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding!",
+    warningComment: "This feature request has not yet received the 20 community upvotes it takes to make to our backlog. 10 days to go. To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding",
+    perform: true
+  }
+}

.vscode/launch.json

@@ -162,9 +162,12 @@
 			"urlFilter": "*workbench.html*",
 			"runtimeArgs": [
 				"--inspect=5875",
-				"--no-cached-data"
+				"--no-cached-data",
 			],
-			"webRoot": "${workspaceFolder}"
+			"webRoot": "${workspaceFolder}",
+			// Settings for js-debug:
+			"pauseForSourceMap": false,
+			"outFiles": ["${workspaceFolder}/out/**/*.js"],
 		},
 		{
 			"type": "node",

.yarnrc

@@ -1,3 +1,3 @@
 disturl "https://atom.io/download/electron"
-target "6.1.6"
+target "7.1.7"
 runtime "electron"

build/builtInExtensions.json

@@ -31,7 +31,7 @@
 	},
 	{
 		"name": "ms-vscode.references-view",
-		"version": "0.0.44",
+		"version": "0.0.45",
 		"repo": "https://github.com/Microsoft/vscode-reference-view",
 		"metadata": {
 			"id": "dc489f46-520d-4556-ae85-1f9eab3c412d",

build/gulpfile.editor.js

@@ -353,6 +353,13 @@ gulp.task('editor-distro',
 	)
 );
 
+gulp.task('monacodts', task.define('monacodts', () => {
+	const result = monacoapi.execute();
+	fs.writeFileSync(result.filePath, result.content);
+	fs.writeFileSync(path.join(root, 'src/vs/editor/common/standalone/standaloneEnums.ts'), result.enums);
+	return Promise.resolve(true);
+}));
+
 //#region monaco type checking
 
 function createTscCompileTask(watch) {

build/lib/i18n.resources.json

@@ -30,6 +30,14 @@
 			"name": "vs/workbench/api/common",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/contrib/backup",
+			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/contrib/bulkEdit",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/contrib/cli",
 			"project": "vscode-workbench"

build/monaco/api.js

@@ -9,7 +9,7 @@ const ts = require("typescript");
 const path = require("path");
 const fancyLog = require("fancy-log");
 const ansiColors = require("ansi-colors");
-const dtsv = '2';
+const dtsv = '3';
 const tsfmt = require('../../tsfmt.json');
 const SRC = path.join(__dirname, '../../src');
 exports.RECIPE_PATH = path.join(__dirname, './monaco.d.ts.recipe');
@@ -148,12 +148,44 @@ function getMassagedTopLevelDeclarationText(sourceFile, declaration, importName,
             }
         });
     }
+    else if (declaration.kind === ts.SyntaxKind.VariableStatement) {
+        const jsDoc = result.substr(0, declaration.getLeadingTriviaWidth(sourceFile));
+        if (jsDoc.indexOf('@monacodtsreplace') >= 0) {
+            const jsDocLines = jsDoc.split(/\r\n|\r|\n/);
+            let directives = [];
+            for (const jsDocLine of jsDocLines) {
+                const m = jsDocLine.match(/^\s*\* \/([^/]+)\/([^/]+)\/$/);
+                if (m) {
+                    directives.push([new RegExp(m[1], 'g'), m[2]]);
+                }
+            }
+            // remove the jsdoc
+            result = result.substr(jsDoc.length);
+            if (directives.length > 0) {
+                // apply replace directives
+                const replacer = createReplacerFromDirectives(directives);
+                result = replacer(result);
+            }
+        }
+    }
     result = result.replace(/export default /g, 'export ');
     result = result.replace(/export declare /g, 'export ');
     result = result.replace(/declare /g, '');
+    let lines = result.split(/\r\n|\r|\n/);
+    for (let i = 0; i < lines.length; i++) {
+        if (/\s*\*/.test(lines[i])) {
+            // very likely a comment
+            continue;
+        }
+        lines[i] = lines[i].replace(/"/g, '\'');
+    }
+    result = lines.join('\n');
     if (declaration.kind === ts.SyntaxKind.EnumDeclaration) {
         result = result.replace(/const enum/, 'enum');
-        enums.push(result);
+        enums.push({
+            enumName: declaration.name.getText(sourceFile),
+            text: result
+        });
     }
     return result;
 }
@@ -277,6 +309,14 @@ function format(text, endl) {
         return result;
     }
 }
+function createReplacerFromDirectives(directives) {
+    return (str) => {
+        for (let i = 0; i < directives.length; i++) {
+            str = str.replace(directives[i][0], directives[i][1]);
+        }
+        return str;
+    };
+}
 function createReplacer(data) {
     data = data || '';
     let rawDirectives = data.split(';');
@@ -292,12 +332,7 @@ function createReplacer(data) {
         findStr = '\\b' + findStr + '\\b';
         directives.push([new RegExp(findStr, 'g'), replaceStr]);
     });
-    return (str) => {
-        for (let i = 0; i < directives.length; i++) {
-            str = str.replace(directives[i][0], directives[i][1]);
-        }
-        return str;
-    };
+    return createReplacerFromDirectives(directives);
 }
 function generateDeclarationFile(recipe, sourceFileGetter) {
     const endl = /\r\n/.test(recipe) ? '\r\n' : '\n';
@@ -415,6 +450,15 @@ function generateDeclarationFile(recipe, sourceFileGetter) {
     resultTxt = resultTxt.split(/\r\n|\n|\r/).join(endl);
     resultTxt = format(resultTxt, endl);
     resultTxt = resultTxt.split(/\r\n|\n|\r/).join(endl);
+    enums.sort((e1, e2) => {
+        if (e1.enumName < e2.enumName) {
+            return -1;
+        }
+        if (e1.enumName > e2.enumName) {
+            return 1;
+        }
+        return 0;
+    });
     let resultEnums = [
         '/*---------------------------------------------------------------------------------------------',
         ' *  Copyright (c) Microsoft Corporation. All rights reserved.',
@@ -423,7 +467,7 @@ function generateDeclarationFile(recipe, sourceFileGetter) {
         '',
         '// THIS IS A GENERATED FILE. DO NOT EDIT DIRECTLY.',
         ''
-    ].concat(enums).join(endl);
+    ].concat(enums.map(e => e.text)).join(endl);
     resultEnums = resultEnums.split(/\r\n|\n|\r/).join(endl);
     resultEnums = format(resultEnums, endl);
     resultEnums = resultEnums.split(/\r\n|\n|\r/).join(endl);

build/monaco/api.ts

@@ -9,7 +9,7 @@ import * as path from 'path';
 import * as fancyLog from 'fancy-log';
 import * as ansiColors from 'ansi-colors';
 
-const dtsv = '2';
+const dtsv = '3';
 
 const tsfmt = require('../../tsfmt.json');
 
@@ -138,7 +138,7 @@ function isDefaultExport(declaration: ts.InterfaceDeclaration | ts.ClassDeclarat
 	);
 }
 
-function getMassagedTopLevelDeclarationText(sourceFile: ts.SourceFile, declaration: TSTopLevelDeclare, importName: string, usage: string[], enums: string[]): string {
+function getMassagedTopLevelDeclarationText(sourceFile: ts.SourceFile, declaration: TSTopLevelDeclare, importName: string, usage: string[], enums: IEnumEntry[]): string {
 	let result = getNodeText(sourceFile, declaration);
 	if (declaration.kind === ts.SyntaxKind.InterfaceDeclaration || declaration.kind === ts.SyntaxKind.ClassDeclaration) {
 		let interfaceDeclaration = <ts.InterfaceDeclaration | ts.ClassDeclaration>declaration;
@@ -177,14 +177,45 @@ function getMassagedTopLevelDeclarationText(sourceFile: ts.SourceFile, declarati
 				// life..
 			}
 		});
+	} else if (declaration.kind === ts.SyntaxKind.VariableStatement) {
+		const jsDoc = result.substr(0, declaration.getLeadingTriviaWidth(sourceFile));
+		if (jsDoc.indexOf('@monacodtsreplace') >= 0) {
+			const jsDocLines = jsDoc.split(/\r\n|\r|\n/);
+			let directives: [RegExp, string][] = [];
+			for (const jsDocLine of jsDocLines) {
+				const m = jsDocLine.match(/^\s*\* \/([^/]+)\/([^/]+)\/$/);
+				if (m) {
+					directives.push([new RegExp(m[1], 'g'), m[2]]);
+				}
+			}
+			// remove the jsdoc
+			result = result.substr(jsDoc.length);
+			if (directives.length > 0) {
+				// apply replace directives
+				const replacer = createReplacerFromDirectives(directives);
+				result = replacer(result);
+			}
+		}
 	}
 	result = result.replace(/export default /g, 'export ');
 	result = result.replace(/export declare /g, 'export ');
 	result = result.replace(/declare /g, '');
+	let lines = result.split(/\r\n|\r|\n/);
+	for (let i = 0; i < lines.length; i++) {
+		if (/\s*\*/.test(lines[i])) {
+			// very likely a comment
+			continue;
+		}
+		lines[i] = lines[i].replace(/"/g, '\'');
+	}
+	result = lines.join('\n');
 
 	if (declaration.kind === ts.SyntaxKind.EnumDeclaration) {
 		result = result.replace(/const enum/, 'enum');
-		enums.push(result);
+		enums.push({
+			enumName: declaration.name.getText(sourceFile),
+			text: result
+		});
 	}
 
 	return result;
@@ -324,6 +355,15 @@ function format(text: string, endl: string): string {
 	}
 }
 
+function createReplacerFromDirectives(directives: [RegExp, string][]): (str: string) => string {
+	return (str: string) => {
+		for (let i = 0; i < directives.length; i++) {
+			str = str.replace(directives[i][0], directives[i][1]);
+		}
+		return str;
+	};
+}
+
 function createReplacer(data: string): (str: string) => string {
 	data = data || '';
 	let rawDirectives = data.split(';');
@@ -341,12 +381,7 @@ function createReplacer(data: string): (str: string) => string {
 		directives.push([new RegExp(findStr, 'g'), replaceStr]);
 	});
 
-	return (str: string) => {
-		for (let i = 0; i < directives.length; i++) {
-			str = str.replace(directives[i][0], directives[i][1]);
-		}
-		return str;
-	};
+	return createReplacerFromDirectives(directives);
 }
 
 interface ITempResult {
@@ -355,6 +390,11 @@ interface ITempResult {
 	enums: string;
 }
 
+interface IEnumEntry {
+	enumName: string;
+	text: string;
+}
+
 function generateDeclarationFile(recipe: string, sourceFileGetter: SourceFileGetter): ITempResult | null {
 	const endl = /\r\n/.test(recipe) ? '\r\n' : '\n';
 
@@ -376,7 +416,7 @@ function generateDeclarationFile(recipe: string, sourceFileGetter: SourceFileGet
 		return importName;
 	};
 
-	let enums: string[] = [];
+	let enums: IEnumEntry[] = [];
 	let version: string | null = null;
 
 	lines.forEach(line => {
@@ -492,6 +532,16 @@ function generateDeclarationFile(recipe: string, sourceFileGetter: SourceFileGet
 	resultTxt = format(resultTxt, endl);
 	resultTxt = resultTxt.split(/\r\n|\n|\r/).join(endl);
 
+	enums.sort((e1, e2) => {
+		if (e1.enumName < e2.enumName) {
+			return -1;
+		}
+		if (e1.enumName > e2.enumName) {
+			return 1;
+		}
+		return 0;
+	});
+
 	let resultEnums = [
 		'/*---------------------------------------------------------------------------------------------',
 		' *  Copyright (c) Microsoft Corporation. All rights reserved.',
@@ -500,7 +550,7 @@ function generateDeclarationFile(recipe: string, sourceFileGetter: SourceFileGet
 		'',
 		'// THIS IS A GENERATED FILE. DO NOT EDIT DIRECTLY.',
 		''
-	].concat(enums).join(endl);
+	].concat(enums.map(e => e.text)).join(endl);
 	resultEnums = resultEnums.split(/\r\n|\n|\r/).join(endl);
 	resultEnums = format(resultEnums, endl);
 	resultEnums = resultEnums.split(/\r\n|\n|\r/).join(endl);

build/monaco/monaco.d.ts.recipe

@@ -62,6 +62,7 @@ export interface ICommandHandler {
 #includeAll(vs/editor/common/editorCommon;editorOptions.=>): IScrollEvent
 #includeAll(vs/editor/common/model/textModelEvents):
 #includeAll(vs/editor/common/controller/cursorEvents):
+#include(vs/platform/accessibility/common/accessibility): AccessibilitySupport
 #includeAll(vs/editor/common/config/editorOptions):
 #includeAll(vs/editor/browser/editorBrowser;editorCommon.=>;editorOptions.=>):
 #include(vs/editor/common/config/fontInfo): FontInfo, BareFontInfo
@@ -87,4 +88,4 @@ declare namespace monaco.worker {
 
 }
 
-//dtsv=2
+//dtsv=3

build/package.json

@@ -43,7 +43,7 @@
     "minimist": "^1.2.0",
     "request": "^2.85.0",
     "terser": "4.3.8",
-    "typescript": "^3.8.0-dev.20200104",
+    "typescript": " 3.8.0-beta",
     "vsce": "1.48.0",
     "vscode-telemetry-extractor": "^1.5.4",
     "xml2js": "^0.4.17"

build/win32/code.iss

@@ -970,10 +970,10 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\*\shell\{#RegValueNam
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "{cm:OpenWithCodeContextMenu,{#ShellNameShort}}"; Tasks: addcontextmenufolders; Flags: uninsdeletekey
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Tasks: addcontextmenufolders
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%V"""; Tasks: addcontextmenufolders
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\background\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "Open w&ith {#ShellNameShort}"; Tasks: addcontextmenufolders; Flags: uninsdeletekey
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\background\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "{cm:OpenWithCodeContextMenu,{#ShellNameShort}}"; Tasks: addcontextmenufolders; Flags: uninsdeletekey
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\background\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Tasks: addcontextmenufolders
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\background\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%V"""; Tasks: addcontextmenufolders
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Drive\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "Open w&ith {#ShellNameShort}"; Tasks: addcontextmenufolders; Flags: uninsdeletekey
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Drive\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "{cm:OpenWithCodeContextMenu,{#ShellNameShort}}"; Tasks: addcontextmenufolders; Flags: uninsdeletekey
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Drive\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Tasks: addcontextmenufolders
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Drive\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%V"""; Tasks: addcontextmenufolders