Merge branch 'main' into aiday/stickyScrollTesting

Author: aiday-mar

build/gulpfile.vscode.js

@@ -423,7 +423,7 @@ gulp.task(task.define(
 			const pathToSetup = 'build/win32/i18n/messages.en.isl';
 
 			return es.merge(
-				gulp.src([pathToRehWebMetadata]).pipe(merge({
+				gulp.src([pathToMetadata, pathToRehWebMetadata]).pipe(merge({
 					fileName: 'nls.metadata.json',
 					jsonSpace: '',
 					concatArrays: true

extensions/git/package.json

@@ -602,6 +602,11 @@
         "title": "%command.git.acceptMerge%",
         "category": "Git",
         "enablement": "isMergeEditor && mergeEditorResultUri in git.mergeChanges"
+      },
+      {
+        "command": "git.openMergeEditor",
+        "title": "%command.git.openMergeEditor%",
+        "category": "Git"
       }
     ],
     "keybindings": [
@@ -1025,6 +1030,10 @@
         {
           "command": "git.api.getRemoteSources",
           "when": "false"
+        },
+        {
+          "command": "git.openMergeEditor",
+          "when": "false"
         }
       ],
       "scm/title": [
@@ -1503,6 +1512,11 @@
           "group": "navigation",
           "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && !isInDiffEditor && !isMergeEditor && resourceScheme == file && scmActiveResourceHasChanges"
         },
+        {
+          "command": "git.openMergeEditor",
+          "group": "navigation@-10",
+          "when": "config.git.enabled && !git.missing && !isInDiffEditor && !isMergeEditor && resource in git.mergeChanges"
+        },
         {
           "command": "git.commitMessageAccept",
           "group": "navigation",

extensions/git/package.nls.json

@@ -103,6 +103,7 @@
 	"command.api.getRepositoryState": "Get Repository State",
 	"command.api.getRemoteSources": "Get Remote Sources",
 	"command.git.acceptMerge": "Accept Merge",
+	"command.git.openMergeEditor": "Open in Merge Editor",
 	"config.enabled": "Whether git is enabled.",
 	"config.path": "Path and filename of the git executable, e.g. `C:\\Program Files\\Git\\bin\\git.exe` (Windows). This can also be an array of string values containing multiple paths to look up.",
 	"config.autoRepositoryDetection": "Configures when repositories should be automatically detected.",

extensions/git/src/commands.ts

@@ -408,7 +408,7 @@ export class CommandCenter {
 		}
 	}
 
-	@command('_git.openMergeEditor')
+	@command('git.openMergeEditor')
 	async openMergeEditor(uri: unknown) {
 		if (!(uri instanceof Uri)) {
 			return;
@@ -422,21 +422,21 @@ export class CommandCenter {
 
 		type InputData = { uri: Uri; title?: string; detail?: string; description?: string };
 		const mergeUris = toMergeUris(uri);
-		const ours: InputData = { uri: mergeUris.ours, title: localize('Yours', 'Yours') };
-		const theirs: InputData = { uri: mergeUris.theirs, title: localize('Theirs', 'Theirs') };
+		const current: InputData = { uri: mergeUris.ours, title: localize('Current', 'Current') };
+		const incoming: InputData = { uri: mergeUris.theirs, title: localize('Incoming', 'Incoming') };
 
 		try {
 			const [head, rebaseOrMergeHead] = await Promise.all([
 				repo.getCommit('HEAD'),
 				isRebasing ? repo.getCommit('REBASE_HEAD') : repo.getCommit('MERGE_HEAD')
 			]);
 			// ours (current branch and commit)
-			ours.detail = head.refNames.map(s => s.replace(/^HEAD ->/, '')).join(', ');
-			ours.description = '$(git-commit) ' + head.hash.substring(0, 7);
+			current.detail = head.refNames.map(s => s.replace(/^HEAD ->/, '')).join(', ');
+			current.description = '$(git-commit) ' + head.hash.substring(0, 7);
 
 			// theirs
-			theirs.detail = rebaseOrMergeHead.refNames.join(', ');
-			theirs.description = '$(git-commit) ' + rebaseOrMergeHead.hash.substring(0, 7);
+			incoming.detail = rebaseOrMergeHead.refNames.join(', ');
+			incoming.description = '$(git-commit) ' + rebaseOrMergeHead.hash.substring(0, 7);
 
 		} catch (error) {
 			// not so bad, can continue with just uris
@@ -446,8 +446,8 @@ export class CommandCenter {
 
 		const options = {
 			base: mergeUris.base,
-			input1: isRebasing ? ours : theirs,
-			input2: isRebasing ? theirs : ours,
+			input1: isRebasing ? current : incoming,
+			input2: isRebasing ? incoming : current,
 			output: uri
 		};
 
@@ -488,6 +488,7 @@ export class CommandCenter {
 				canSelectFolders: true,
 				canSelectMany: false,
 				defaultUri: Uri.file(defaultCloneDirectory),
+				title: localize('selectFolderTitle', "Choose a folder to clone {0} into", url),
 				openLabel: localize('selectFolder', "Select Repository Location")
 			});
 

extensions/git/src/repository.ts

@@ -619,7 +619,7 @@ class ResourceCommandResolver {
 			const bothModified = resource.type === Status.BOTH_MODIFIED;
 			if (resource.rightUri && workspace.getConfiguration('git').get<boolean>('mergeEditor', false) && (bothModified || resource.type === Status.BOTH_ADDED)) {
 				return {
-					command: '_git.openMergeEditor',
+					command: 'git.openMergeEditor',
 					title: localize('open.merge', "Open Merge"),
 					arguments: [resource.rightUri]
 				};
@@ -938,7 +938,8 @@ export class Repository implements Disposable {
 
 		workspace.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration('git.mergeEditor')) {
-				this.mergeGroup.resourceStates = this.mergeGroup.resourceStates.map(r => r.clone());
+				// this.mergeGroup.resourceStates = this.mergeGroup.resourceStates.map(r => r.clone());
+				this.status();
 			}
 		}, undefined, this.disposables);
 

extensions/github/package.json

@@ -45,7 +45,8 @@
       },
       {
         "command": "github.openOnVscodeDev",
-        "title": "Open on vscode.dev"
+        "title": "Open on vscode.dev",
+        "icon": "$(globe)"
       }
     ],
     "continueEditSession": [

extensions/markdown-language-features/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vscode-markdown-languageserver",
   "description": "Markdown language server",
-  "version": "0.0.0-alpha-2",
+  "version": "0.0.0-alpha-3",
   "author": "Microsoft Corporation",
   "license": "MIT",
   "engines": {
@@ -13,7 +13,7 @@
     "vscode-languageserver": "^8.0.2",
     "vscode-languageserver-textdocument": "^1.0.5",
     "vscode-languageserver-types": "^3.17.1",
-    "vscode-markdown-languageservice": "^0.0.0-alpha.15",
+    "vscode-markdown-languageservice": "^0.0.0",
     "vscode-uri": "^3.0.3"
   },
   "devDependencies": {

extensions/markdown-language-features/server/yarn.lock

@@ -42,10 +42,10 @@ vscode-languageserver@^8.0.2:
   dependencies:
     vscode-languageserver-protocol "3.17.2"
 
-vscode-markdown-languageservice@^0.0.0-alpha.15:
-  version "0.0.0-alpha.15"
-  resolved "https://registry.yarnpkg.com/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.0.0-alpha.15.tgz#f11b18eb2ced8b13d90abc50825d99ce825d88b8"
-  integrity sha512-OLMd6LlDf3v4/ULU354gwsEcNyuUjEGDFQIYwi78gFXd89K2eWG4KewDR9fl3ip00lOcHcvQWqFBRgkfr72DRg==
+vscode-markdown-languageservice@^0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.0.0.tgz#029822a0c95fd4040ed3a2154b640ddb87160743"
+  integrity sha512-Qux6lErBmasjBnDtK6Ff7LZxdrFl29ChxaJWLuT+p67UcAZt3UdCcFjll+BpZJ8hLKfsVGEG6rdYFAuRXaty9Q==
   dependencies:
     picomatch "^2.3.1"
     vscode-languageserver-textdocument "^1.0.5"

extensions/shellscript/package.json

@@ -19,6 +19,7 @@
           "Shell Script",
           "shellscript",
           "bash",
+          "fish",
           "sh",
           "zsh",
           "ksh",
@@ -45,6 +46,7 @@
           ".zlogout",
           ".zshenv",
           ".zsh-theme",
+          ".fish",
           ".ksh",
           ".csh",
           ".cshrc",
@@ -65,7 +67,7 @@
           "bashrc_Apple_Terminal",
           "zshrc_Apple_Terminal"
         ],
-        "firstLine": "^#!.*\\b(bash|zsh|sh|ksh|dtksh|pdksh|mksh|ash|dash|yash|sh|csh|jcsh|tcsh|itcsh).*|^#\\s*-\\*-[^*]*mode:\\s*shell-script[^*]*-\\*-",
+        "firstLine": "^#!.*\\b(bash|fish|zsh|sh|ksh|dtksh|pdksh|mksh|ash|dash|yash|sh|csh|jcsh|tcsh|itcsh).*|^#\\s*-\\*-[^*]*mode:\\s*shell-script[^*]*-\\*-",
         "configuration": "./language-configuration.json",
         "mimetypes": [
           "text/x-shellscript"

extensions/typescript-language-features/src/languageFeatures/hover.ts

@@ -4,15 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
+import * as nls from 'vscode-nls';
 import type * as Proto from '../protocol';
-import { localize } from '../tsServer/versionProvider';
 import { ClientCapability, ITypeScriptServiceClient, ServerType } from '../typescriptService';
 import { conditionalRegistration, requireSomeCapability } from '../utils/dependentRegistration';
 import { DocumentSelector } from '../utils/documentSelector';
 import { markdownDocumentation } from '../utils/previewer';
 import * as typeConverters from '../utils/typeConverters';
 import FileConfigurationManager from './fileConfigurationManager';
 
+const localize = nls.loadMessageBundle();
+
 
 class TypeScriptHoverProvider implements vscode.HoverProvider {