cleanup missed rebase.

salesforce · Nov 12, 2024 · 9a21671 · 9a21671
1 parent 56a6322
commit 9a21671
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 30 deletions.
diff --git a/.vscodeignore b/.vscodeignore
@@ -15,26 +15,3 @@ coverage/
 .github
 out/
 !out/extension.js
-
-# lsp/server/node_modules/*
-# **/node_modules/**
-# Exclude source files
-# packages/*/src
-# src
-# test
-
-# # Exclude build artifacts and configuration files
-# tsconfig*.json
-# *.tsbuildinfo
-
-# # Exclude node_modules except for production dependencies
-# node_modules/**
-# !node_modules/shared-module
-# !node_modules/package-a
-# !node_modules/package-b
-
-# # Exclude other unnecessary files
-# .vscode
-# .vscodeignore
-# .gitignore
-# README.md
diff --git a/lsp/server/test/diagnostic/js/adapters-local-change-not-aware.test.ts b/lsp/server/test/diagnostic/js/adapters-local-change-not-aware.test.ts
@@ -15,8 +15,8 @@ import {
     URL_FOR_GET_RELATED_LIST_RECORDS_EXTERNAL_DOC,
     MESSAGE_FOR_GET_RELATED_LIST_RECORDS,
     MESSAGE_FOR_GET_RELATED_LIST_COUNT
-} from '../../../diagnostic/js/adapters-local-change-not-aware';
-import { parseJs } from '../../../utils/babelUtil';
+} from '../../../src/diagnostic/js/adapters-local-change-not-aware';
+import { parseJs } from '../../../src/utils/babelUtil';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 
 suite(

diff --git a/lsp/server/test/validatorManager.test.ts b/lsp/server/test/validatorManager.test.ts
@@ -9,7 +9,7 @@ import { TextDocument } from 'vscode-languageserver-textdocument';
 import * as assert from 'assert';
 import { suite, test } from 'mocha';
 
-import { ValidatorManager } from '../validatorManager';
+import { ValidatorManager } from '../src/validatorManager';
 import { MESSAGE_FOR_GET_RELATED_LIST_RECORDS } from '../src/diagnostic/js/adapters-local-change-not-aware';
 
 suite('Diagnostics Test Suite - Server - ValidatorManager', () => {

diff --git a/test/runTest.ts b/test/runTest.ts
@@ -38,15 +38,16 @@ async function main() {
         // support in the `engines` section of our package.
         const vscodeExecutablePath =
             await downloadAndUnzipVSCode(VSCODE_TEST_VERSION);
-        const [cliPath, ...args] =
+        const [cliPath, ...cliArgs] =
             resolveCliArgsFromVSCodeExecutablePath(vscodeExecutablePath);
 
         // Install the Salesforce Extensions, which is a pre-req for our
         // extension. Bail if there's an error.
+        const isWindows = process.platform === 'win32';
         const installExtensionDepsOuput = spawnSync(
-            cliPath,
-            [...args, '--install-extension', CORE_EXTENSION_ID],
-            { stdio: 'inherit', encoding: 'utf-8' }
+            isWindows ? `"${cliPath}"` : cliPath,
+            [...cliArgs, '--install-extension', CORE_EXTENSION_ID],
+            { stdio: 'inherit', encoding: 'utf-8', shell: isWindows }
         );
         if (installExtensionDepsOuput.error) {
             console.error(