Merge pull request #181912 from microsoft/tyriar/179913

Set SI command line when nonce is not passed
microsoft · May 9, 2023 · 1f8d8e9 · 1f8d8e9
2 parents 570b5f7 + dffb616
commit 1f8d8e9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts b/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
@@ -550,7 +550,7 @@ export class CommandDetectionCapability implements ICommandDetectionCapability {
 	}
 
 	setCommandLine(commandLine: string, isTrusted: boolean) {
-		this._logService.debug('CommandDetectionCapability#setCommandLine', commandLine);
+		this._logService.debug('CommandDetectionCapability#setCommandLine', commandLine, isTrusted);
 		this._currentCommand.command = commandLine;
 		this._currentCommand.isTrusted = isTrusted;
 	}

diff --git a/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts b/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts
@@ -334,7 +334,7 @@ export class ShellIntegrationAddon extends Disposable implements IShellIntegrati
 			}
 			case VSCodeOscPt.CommandLine: {
 				let commandLine: string;
-				if (args.length === 2) {
+				if (args.length >= 1 || args.length <= 2) {
 					commandLine = deserializeMessage(args[0]);
 				} else {
 					commandLine = '';