Merge branch 'main' into fix-201081

Author: meganrogge

extensions/git/package.json

@@ -2961,8 +2961,10 @@
     "configurationDefaults": {
       "[git-commit]": {
         "editor.rulers": [
+          50,
           72
         ],
+        "editor.wordWrap": "off",
         "workbench.editor.restoreViewState": false
       },
       "[git-rebase]": {

extensions/git/src/git.ts

@@ -2543,7 +2543,7 @@ export class Repository {
 			return branch;
 		}
 
-		return Promise.reject<Branch>(new Error('No such branch'));
+		return Promise.reject<Branch>(new Error(`No such branch: ${name}`));
 	}
 
 	async getDefaultBranch(): Promise<Branch> {

extensions/xml/xml.language-configuration.json

@@ -14,8 +14,7 @@
 		{ "open": "(", "close": ")" },
 		{ "open": "\"", "close": "\"", "notIn": ["string"] },
 		{ "open": "'", "close": "'", "notIn": ["string"] },
-		{ "open": "<!--", "close": "-->", "notIn": [ "comment", "string" ]},
-		{ "open": "<![CDATA[", "close": "]]>", "notIn": [ "comment", "string" ]}
+		{ "open": "<!--", "close": "-->", "notIn": [ "comment", "string" ]}
 	],
 	"surroundingPairs": [
 		{ "open": "'", "close": "'" },

src/vs/base/common/labels.ts

@@ -436,15 +436,17 @@ export function unmnemonicLabel(label: string): string {
 }
 
 /**
- * Splits a recent label in name and parent path, supporting both '/' and '\' and workspace suffixes
+ * Splits a recent label in name and parent path, supporting both '/' and '\' and workspace suffixes.
+ * If the location is remote, the remote name is included in the name part.
  */
-export function splitRecentLabel(recentLabel: string) {
+export function splitRecentLabel(recentLabel: string): { name: string; parentPath: string } {
 	if (recentLabel.endsWith(']')) {
 		// label with workspace suffix
 		const lastIndexOfSquareBracket = recentLabel.lastIndexOf(' [', recentLabel.length - 2);
 		if (lastIndexOfSquareBracket !== -1) {
 			const split = splitName(recentLabel.substring(0, lastIndexOfSquareBracket));
-			return { name: split.name, parentPath: split.parentPath + recentLabel.substring(lastIndexOfSquareBracket) };
+			const remoteNameWithSpace = recentLabel.substring(lastIndexOfSquareBracket);
+			return { name: split.name + remoteNameWithSpace, parentPath: split.parentPath };
 		}
 	}
 	return splitName(recentLabel);

src/vs/base/common/strings.ts

@@ -48,6 +48,25 @@ export function format2(template: string, values: Record<string, unknown>): stri
 	return template.replace(_format2Regexp, (match, group) => (values[group] ?? match) as string);
 }
 
+/**
+ * Encodes the given value so that it can be used as literal value in html attributes.
+ *
+ * In other words, computes `$val`, such that `attr` in `<div attr="$val" />` has the runtime value `value`.
+ * This prevents XSS injection.
+ */
+export function htmlAttributeEncodeValue(value: string): string {
+	return value.replace(/[<>"'&]/g, ch => {
+		switch (ch) {
+			case '<': return '&lt;';
+			case '>': return '&gt;';
+			case '"': return '&quot;';
+			case '\'': return '&apos;';
+			case '&': return '&amp;';
+		}
+		return ch;
+	});
+}
+
 /**
  * Converts HTML characters inside the string to use entities instead. Makes the string safe from
  * being used e.g. in HTMLElement.innerHTML.

src/vs/base/test/common/strings.test.ts

@@ -532,3 +532,13 @@ suite('Strings', () => {
 
 	ensureNoDisposablesAreLeakedInTestSuite();
 });
+
+test('htmlAttributeEncodeValue', () => {
+	assert.strictEqual(strings.htmlAttributeEncodeValue(''), '');
+	assert.strictEqual(strings.htmlAttributeEncodeValue('abc'), 'abc');
+	assert.strictEqual(strings.htmlAttributeEncodeValue('<script>alert("Hello")</script>'), '&lt;script&gt;alert(&quot;Hello&quot;)&lt;/script&gt;');
+	assert.strictEqual(strings.htmlAttributeEncodeValue('Hello & World'), 'Hello &amp; World');
+	assert.strictEqual(strings.htmlAttributeEncodeValue('"Hello"'), '&quot;Hello&quot;');
+	assert.strictEqual(strings.htmlAttributeEncodeValue('\'Hello\''), '&apos;Hello&apos;');
+	assert.strictEqual(strings.htmlAttributeEncodeValue('<>&\'"'), '&lt;&gt;&amp;&apos;&quot;');
+});

src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts

@@ -20,17 +20,17 @@ import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
  * This can end up producing multiple `LineDecorationToRender`.
  */
 export class DecorationToRender {
-	_decorationToRenderBrand: void = undefined;
+	public readonly _decorationToRenderBrand: void = undefined;
 
-	public startLineNumber: number;
-	public endLineNumber: number;
-	public className: string;
 	public readonly zIndex: number;
 
-	constructor(startLineNumber: number, endLineNumber: number, className: string, zIndex: number | undefined) {
-		this.startLineNumber = +startLineNumber;
-		this.endLineNumber = +endLineNumber;
-		this.className = String(className);
+	constructor(
+		public readonly startLineNumber: number,
+		public readonly endLineNumber: number,
+		public readonly className: string,
+		public readonly tooltip: string | null,
+		zIndex: number | undefined,
+	) {
 		this.zIndex = zIndex ?? 0;
 	}
 }
@@ -42,6 +42,7 @@ export class LineDecorationToRender {
 	constructor(
 		public readonly className: string,
 		public readonly zIndex: number,
+		public readonly tooltip: string | null,
 	) { }
 }
 
@@ -108,7 +109,7 @@ export abstract class DedupOverlay extends DynamicViewOverlay {
 			}
 
 			for (let i = startLineIndex; i <= prevEndLineIndex; i++) {
-				output[i].add(new LineDecorationToRender(className, zIndex));
+				output[i].add(new LineDecorationToRender(className, zIndex, d.tooltip));
 			}
 		}
 

src/vs/editor/browser/viewParts/linesDecorations/linesDecorations.ts

@@ -78,11 +78,11 @@ export class LinesDecorationsOverlay extends DedupOverlay {
 			const linesDecorationsClassName = d.options.linesDecorationsClassName;
 			const zIndex = d.options.zIndex;
 			if (linesDecorationsClassName) {
-				r[rLen++] = new DecorationToRender(d.range.startLineNumber, d.range.endLineNumber, linesDecorationsClassName, zIndex);
+				r[rLen++] = new DecorationToRender(d.range.startLineNumber, d.range.endLineNumber, linesDecorationsClassName, d.options.linesDecorationsTooltip ?? null, zIndex);
 			}
 			const firstLineDecorationClassName = d.options.firstLineDecorationClassName;
 			if (firstLineDecorationClassName) {
-				r[rLen++] = new DecorationToRender(d.range.startLineNumber, d.range.startLineNumber, firstLineDecorationClassName, zIndex);
+				r[rLen++] = new DecorationToRender(d.range.startLineNumber, d.range.startLineNumber, firstLineDecorationClassName, d.options.linesDecorationsTooltip ?? null, zIndex);
 			}
 		}
 		return r;
@@ -103,7 +103,12 @@ export class LinesDecorationsOverlay extends DedupOverlay {
 			const decorations = toRender[lineIndex].getDecorations();
 			let lineOutput = '';
 			for (const decoration of decorations) {
-				lineOutput += '<div class="cldr ' + decoration.className + common;
+				let addition = '<div class="cldr ' + decoration.className;
+				if (decoration.tooltip !== null) {
+					addition += '" title="' + decoration.tooltip; // The tooltip is already escaped.
+				}
+				addition += common;
+				lineOutput += addition;
 			}
 			output[lineIndex] = lineOutput;
 		}

src/vs/editor/browser/viewParts/marginDecorations/marginDecorations.ts

@@ -64,7 +64,7 @@ export class MarginViewLineDecorationsOverlay extends DedupOverlay {
 			const marginClassName = d.options.marginClassName;
 			const zIndex = d.options.zIndex;
 			if (marginClassName) {
-				r[rLen++] = new DecorationToRender(d.range.startLineNumber, d.range.endLineNumber, marginClassName, zIndex);
+				r[rLen++] = new DecorationToRender(d.range.startLineNumber, d.range.endLineNumber, marginClassName, null, zIndex);
 			}
 		}
 		return r;

src/vs/editor/common/languages.ts

@@ -1778,6 +1778,7 @@ export interface CommentReaction {
 	readonly count?: number;
 	readonly hasReacted?: boolean;
 	readonly canEdit?: boolean;
+	readonly reactors?: readonly string[];
 }
 
 /**