Merge branch 'main' into merogge/toc

Author: meganrogge

build/azure-pipelines/sdl-scan.yml

@@ -32,6 +32,8 @@ variables:
     value: x64
   - name: Codeql.enabled
     value: true
+  - name: Codeql.TSAEnabled
+    value: true
 
 stages:
   - stage: Windows

extensions/typescript-language-features/src/tsServer/protocol/protocol.d.ts

@@ -19,14 +19,5 @@ declare module 'typescript/lib/tsserverlibrary' {
 		interface Response {
 			readonly _serverType?: ServerType;
 		}
-
-		interface LinkedEditingRangesBody {
-			ranges: TextSpan[];
-			wordPattern?: string;
-		}
-
-		interface LinkedEditingRangeResponse extends Response {
-			readonly body: LinkedEditingRangesBody;
-		}
 	}
 }

src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts

@@ -6,7 +6,6 @@
 import { timeout } from 'vs/base/common/async';
 import { debounce } from 'vs/base/common/decorators';
 import { Emitter } from 'vs/base/common/event';
-import { isWindows } from 'vs/base/common/platform';
 import { ILogService } from 'vs/platform/log/common/log';
 import { ICommandDetectionCapability, TerminalCapability, ITerminalCommand, IHandleCommandOptions, ICommandInvalidationRequest, CommandInvalidationReason, ISerializedCommand, ISerializedCommandDetectionCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
 import { ITerminalOutputMatch, ITerminalOutputMatcher } from 'vs/platform/terminal/common/terminal';
@@ -492,7 +491,7 @@ export class CommandDetectionCapability implements ICommandDetectionCapability {
 				commandStartLineContent: this._currentCommand.commandStartLineContent,
 				hasOutput: () => !executedMarker?.isDisposed && !endMarker?.isDisposed && !!(executedMarker && endMarker && executedMarker?.line < endMarker!.line),
 				getOutput: () => getOutputForCommand(executedMarker, endMarker, buffer),
-				getOutputMatch: (outputMatcher: ITerminalOutputMatcher) => getOutputMatchForCommand(isWindows ? this._currentCommand.commandStartMarker : executedMarker, endMarker, buffer, this._terminal.cols, outputMatcher),
+				getOutputMatch: (outputMatcher: ITerminalOutputMatcher) => getOutputMatchForCommand(this._isWindowsPty && (executedMarker?.line === endMarker?.line) ? this._currentCommand.commandStartMarker : executedMarker, endMarker, buffer, this._terminal.cols, outputMatcher),
 				markProperties: options?.markProperties
 			};
 			this._commands.push(newCommand);
@@ -618,7 +617,7 @@ export class CommandDetectionCapability implements ICommandDetectionCapability {
 				exitCode: e.exitCode,
 				hasOutput: () => !executedMarker?.isDisposed && !endMarker?.isDisposed && !!(executedMarker && endMarker && executedMarker.line < endMarker.line),
 				getOutput: () => getOutputForCommand(executedMarker, endMarker, buffer),
-				getOutputMatch: (outputMatcher: ITerminalOutputMatcher) => getOutputMatchForCommand(isWindows ? marker : executedMarker, endMarker, buffer, this._terminal.cols, outputMatcher),
+				getOutputMatch: (outputMatcher: ITerminalOutputMatcher) => getOutputMatchForCommand(this._isWindowsPty && (executedMarker?.line === endMarker?.line) ? marker : executedMarker, endMarker, buffer, this._terminal.cols, outputMatcher),
 				markProperties: e.markProperties,
 				wasReplayed: true
 			};

src/vs/workbench/contrib/terminalContrib/quickFix/browser/terminalQuickFixBuiltinActions.ts

@@ -127,11 +127,31 @@ export function gitPushSetUpstream(): ITerminalQuickFixInternalOptions {
 		id: 'Git Push Set Upstream',
 		type: 'internal',
 		commandLineMatcher: GitPushCommandLineRegex,
+		/**
+			Example output on Windows:
+			8: PS C:\Users\merogge\repos\xterm.js> git push
+			7: fatal: The current branch sdjfskdjfdslkjf has no upstream branch.
+			6: To push the current branch and set the remote as upstream, use
+			5:
+			4:	git push --set-upstream origin sdjfskdjfdslkjf
+			3:
+			2: To have this happen automatically for branches without a tracking
+			1: upstream, see 'push.autoSetupRemote' in 'git help config'.
+			0:
+
+			Example output on macOS:
+			5: meganrogge@Megans-MacBook-Pro xterm.js % git push
+			4: fatal: The current branch merogge/asjdkfsjdkfsdjf has no upstream branch.
+			3: To push the current branch and set the remote as upstream, use
+			2:
+			1:	git push --set-upstream origin merogge/asjdkfsjdkfsdjf
+			0:
+		 */
 		outputMatcher: {
 			lineMatcher: GitPushOutputRegex,
 			anchor: 'bottom',
 			offset: 0,
-			length: 5
+			length: 8
 		},
 		commandExitResult: 'error',
 		getQuickFixes: (matchResult: ITerminalCommandMatchResult) => {