Only disable for arm, clean up

Author: Tyriar

src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/commandSimplifier.ts

@@ -84,18 +84,21 @@ export class CommandSimplifier {
 	private async _rewriteUnsupportedPwshChainOperators(commandLine: string, os: OperatingSystem, shell: string) {
 		// TODO: This should just be Windows PowerShell in the future when the powershell grammar
 		// supports chain operators https://github.com/airbus-cert/tree-sitter-powershell/issues/27
-		const disablePowerShellRewrites = true; // see https://github.com/microsoft/vscode/issues/273177
-		if (!disablePowerShellRewrites && isPowerShell(shell, os)) {
-			const doubleAmpersandCaptures = await this._treeSitterCommandParser.queryTree(TreeSitterCommandParserLanguage.PowerShell, commandLine, [
-				'(',
-				'  (command',
-				'    (command_elements',
-				'      (generic_token) @double.ampersand',
-				'        (#eq? @double.ampersand "&&")))',
-				')',
-			].join('\n'));
-			for (const capture of doubleAmpersandCaptures.reverse()) {
-				commandLine = `${commandLine.substring(0, capture.node.startIndex)};${commandLine.substring(capture.node.endIndex)}`;
+		if (isPowerShell(shell, os)) {
+			try {
+				const doubleAmpersandCaptures = await this._treeSitterCommandParser.queryTree(TreeSitterCommandParserLanguage.PowerShell, commandLine, [
+					'(',
+					'  (command',
+					'    (command_elements',
+					'      (generic_token) @double.ampersand',
+					'        (#eq? @double.ampersand "&&")))',
+					')',
+				].join('\n'));
+				for (const capture of doubleAmpersandCaptures.reverse()) {
+					commandLine = `${commandLine.substring(0, capture.node.startIndex)};${commandLine.substring(capture.node.endIndex)}`;
+				}
+			} catch {
+				// Swallow tree sitter failures
 			}
 		}
 		return commandLine;

src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/treeSitterCommandParser.ts

@@ -24,35 +24,33 @@ export class TreeSitterCommandParser {
 	}
 
 	async extractSubCommands(languageId: TreeSitterCommandParserLanguage, commandLine: string): Promise<string[]> {
-		const disableSubCommandExtraction = true; // see https://github.com/microsoft/vscode/issues/273177
+		this._throwIfCanCrash(languageId);
 
-		if (disableSubCommandExtraction) {
-			throw new Error('not supported');
-		} else {
-			const parser = await this._parser;
-			const language = await waitForState(derived(reader => {
-				return this._treeSitterLibraryService.getLanguage(languageId, true, reader);
-			}));
-			parser.setLanguage(language);
-
-			const tree = parser.parse(commandLine);
-			if (!tree) {
-				throw new BugIndicatingError('Failed to parse tree');
-			}
-
-			const query = await this._getQuery(language);
-			if (!query) {
-				throw new BugIndicatingError('Failed to create tree sitter query');
-			}
-
-			const captures = query.captures(tree.rootNode);
-			const subCommands = captures.map(e => e.node.text);
-
-			return subCommands;
+		const parser = await this._parser;
+		const language = await waitForState(derived(reader => {
+			return this._treeSitterLibraryService.getLanguage(languageId, true, reader);
+		}));
+		parser.setLanguage(language);
+
+		const tree = parser.parse(commandLine);
+		if (!tree) {
+			throw new BugIndicatingError('Failed to parse tree');
+		}
+
+		const query = await this._getQuery(language);
+		if (!query) {
+			throw new BugIndicatingError('Failed to create tree sitter query');
 		}
+
+		const captures = query.captures(tree.rootNode);
+		const subCommands = captures.map(e => e.node.text);
+
+		return subCommands;
 	}
 
 	async queryTree(languageId: TreeSitterCommandParserLanguage, commandLine: string, querySource: string): Promise<QueryCapture[]> {
+		this._throwIfCanCrash(languageId);
+
 		const parser = await this._parser;
 		const language = await waitForState(derived(reader => {
 			return this._treeSitterLibraryService.getLanguage(languageId, true, reader);
@@ -82,4 +80,14 @@ export class TreeSitterCommandParser {
 		}
 		return query;
 	}
+
+	private _throwIfCanCrash(languageId: TreeSitterCommandParserLanguage) {
+		// TODO: The powershell grammar can cause an OOM crash on arm https://github.com/microsoft/vscode/issues/273177
+		if (
+			(process.arch === 'arm' || process.arch === 'arm64') &&
+			languageId === TreeSitterCommandParserLanguage.PowerShell
+		) {
+			throw new Error('not supported');
+		}
+	}
 }

src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/commandSimplifier.test.ts

@@ -23,7 +23,8 @@ import { FileService } from '../../../../../../platform/files/common/fileService
 import { Schemas } from '../../../../../../base/common/network.js';
 import { TreeSitterLibraryService } from '../../../../../services/treeSitter/browser/treeSitterLibraryService.js';
 
-suite.skip('command re-writing', () => {
+// TODO: The powershell grammar can cause an OOM crash on arm https://github.com/microsoft/vscode/issues/273177
+(process.arch === 'arm' || process.arch === 'arm64' ? suite.skip : suite)('command re-writing', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
 
 	let instantiationService: TestInstantiationService;

src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/runInTerminalTool.test.ts

@@ -44,7 +44,8 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 	}
 }
 
-suite('RunInTerminalTool', () => {
+// TODO: The powershell grammar can cause an OOM crash on arm https://github.com/microsoft/vscode/issues/273177
+(process.arch === 'arm' || process.arch === 'arm64' ? suite.skip : suite)('RunInTerminalTool', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
 
 	let instantiationService: TestInstantiationService;

src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/treeSitterCommandParser.test.ts

@@ -15,7 +15,8 @@ import { Schemas } from '../../../../../../base/common/network.js';
 import { TestIPCFileSystemProvider } from '../../../../../test/electron-browser/workbenchTestServices.js';
 import { TreeSitterCommandParser, TreeSitterCommandParserLanguage } from '../../browser/treeSitterCommandParser.js';
 
-suite('TreeSitterCommandParser', () => {
+// TODO: The powershell grammar can cause an OOM crash on arm https://github.com/microsoft/vscode/issues/273177
+(process.arch === 'arm' || process.arch === 'arm64' ? suite.skip : suite)('TreeSitterCommandParser', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
 
 	let instantiationService: TestInstantiationService;