Merge branch 'main' into tyriar/utility_ptyhost__2

Author: Tyriar

extensions/git/package.json

@@ -2706,6 +2706,14 @@
           "default": "prompt",
           "markdownDescription": "%config.openRepositoryInParentFolders%",
           "scope": "resource"
+        },
+        "git.similarityThreshold": {
+          "type": "number",
+          "default": 50,
+          "minimum": 0,
+          "maximum": 100,
+          "description": "%config.similarityThreshold%",
+          "scope": "resource"
         }
       }
     },

extensions/git/package.nls.json

@@ -252,6 +252,7 @@
 	"config.publishBeforeContinueOn.always": "Always publish unpublished git state when using Continue Working On from a git repository",
 	"config.publishBeforeContinueOn.never": "Never publish unpublished git state when using Continue Working On from a git repository",
 	"config.publishBeforeContinueOn.prompt": "Prompt to publish unpublished git state when using Continue Working On from a git repository",
+	"config.similarityThreshold": "Controls the threshold of the similarity index (i.e. amount of additions/deletions compared to the file's size) for changes in a pair of added/deleted files to be considered a rename.",
 	"submenu.explorer": "Git",
 	"submenu.commit": "Commit",
 	"submenu.commit.amend": "Amend",

extensions/git/src/commands.ts

@@ -308,7 +308,7 @@ function getCheckoutProcessor(repository: Repository, type: string): CheckoutPro
 }
 
 function sanitizeBranchName(name: string, whitespaceChar: string): string {
-	return name.trim().replace(/^-+/, '').replace(/^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$|\.$|\[|\]$/g, whitespaceChar);
+	return name ? name.trim().replace(/^-+/, '').replace(/^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$|\.$|\[|\]$/g, whitespaceChar) : name;
 }
 
 function sanitizeRemoteName(name: string) {

extensions/git/src/git.ts

@@ -2000,7 +2000,7 @@ export class Repository {
 		}
 	}
 
-	async getStatus(opts?: { limit?: number; ignoreSubmodules?: boolean; untrackedChanges?: 'mixed' | 'separate' | 'hidden'; cancellationToken?: CancellationToken }): Promise<{ status: IFileStatus[]; statusLength: number; didHitLimit: boolean }> {
+	async getStatus(opts?: { limit?: number; ignoreSubmodules?: boolean; similarityThreshold?: number; untrackedChanges?: 'mixed' | 'separate' | 'hidden'; cancellationToken?: CancellationToken }): Promise<{ status: IFileStatus[]; statusLength: number; didHitLimit: boolean }> {
 		if (opts?.cancellationToken && opts?.cancellationToken.isCancellationRequested) {
 			throw new CancellationError();
 		}
@@ -2020,6 +2020,10 @@ export class Repository {
 			args.push('--ignore-submodules');
 		}
 
+		if (opts?.similarityThreshold) {
+			args.push(`--find-renames=${opts.similarityThreshold}%`);
+		}
+
 		const child = this.stream(args, { env });
 
 		let result = new Promise<{ status: IFileStatus[]; statusLength: number; didHitLimit: boolean }>((c, e) => {

extensions/git/src/repository.ts

@@ -2056,9 +2056,10 @@ export class Repository implements Disposable {
 		const ignoreSubmodules = scopedConfig.get<boolean>('ignoreSubmodules');
 
 		const limit = scopedConfig.get<number>('statusLimit', 10000);
+		const similarityThreshold = scopedConfig.get<number>('similarityThreshold', 50);
 
 		const start = new Date().getTime();
-		const { status, statusLength, didHitLimit } = await this.repository.getStatus({ limit, ignoreSubmodules, untrackedChanges, cancellationToken });
+		const { status, statusLength, didHitLimit } = await this.repository.getStatus({ limit, ignoreSubmodules, similarityThreshold, untrackedChanges, cancellationToken });
 		const totalTime = new Date().getTime() - start;
 
 		this.isRepositoryHuge = didHitLimit ? { limit } : false;

extensions/notebook-renderers/src/index.ts

@@ -198,13 +198,28 @@ function onScrollHandler(e: globalThis.Event) {
 	}
 }
 
+function onKeypressHandler(e: KeyboardEvent) {
+	if (e.ctrlKey || e.shiftKey) {
+		return;
+	}
+	if (e.code === 'ArrowDown' || e.code === 'End' || e.code === 'ArrowUp' || e.code === 'Home') {
+		// These should change the scroll position, not adjust the selected cell in the notebook
+		e.stopPropagation();
+	}
+}
+
 // if there is a scrollable output, it will be scrolled to the given value if provided or the bottom of the element
 function initializeScroll(scrollableElement: HTMLElement, disposables: DisposableStore, scrollTop?: number) {
 	if (scrollableElement.classList.contains(scrollableClass)) {
-		scrollableElement.classList.toggle('scrollbar-visible', scrollableElement.scrollHeight > scrollableElement.clientHeight);
+		const scrollbarVisible = scrollableElement.scrollHeight > scrollableElement.clientHeight;
+		scrollableElement.classList.toggle('scrollbar-visible', scrollbarVisible);
 		scrollableElement.scrollTop = scrollTop !== undefined ? scrollTop : scrollableElement.scrollHeight;
-		scrollableElement.addEventListener('scroll', onScrollHandler);
-		disposables.push({ dispose: () => scrollableElement.removeEventListener('scroll', onScrollHandler) });
+		if (scrollbarVisible) {
+			scrollableElement.addEventListener('scroll', onScrollHandler);
+			disposables.push({ dispose: () => scrollableElement.removeEventListener('scroll', onScrollHandler) });
+			scrollableElement.addEventListener('keydown', onKeypressHandler);
+			disposables.push({ dispose: () => scrollableElement.removeEventListener('keydown', onKeypressHandler) });
+		}
 	}
 }
 

extensions/theme-abyss/themes/abyss-color-theme.json

@@ -17,8 +17,11 @@
 			}
 		},
 		{
-			"name": "Comment",
-			"scope": "comment",
+			"name": "Comments",
+			"scope": [
+				"comment",
+				"string.quoted.docstring"
+			],
 			"settings": {
 				"foreground": "#384887"
 			}

extensions/theme-defaults/themes/dark_vs.json

@@ -57,7 +57,11 @@
 			}
 		},
 		{
-			"scope": "comment",
+			"name": "Comments",
+			"scope": [
+				"comment",
+				"string.quoted.docstring"
+			],
 			"settings": {
 				"foreground": "#6A9955"
 			}

extensions/theme-defaults/themes/hc_black.json

@@ -43,7 +43,11 @@
 			}
 		},
 		{
-			"scope": "comment",
+			"name": "Comments",
+			"scope": [
+				"comment",
+				"string.quoted.docstring"
+			],
 			"settings": {
 				"foreground": "#7ca668"
 			}

extensions/theme-defaults/themes/hc_light.json

@@ -27,7 +27,11 @@
 			}
 		},
 		{
-			"scope": "comment",
+			"name": "Comments",
+			"scope": [
+				"comment",
+				"string.quoted.docstring"
+			],
 			"settings": {
 				"foreground": "#515151"
 			}