astro-vscode 2.15.4 → 2.16.0

package/package.json

@@ -24,22 +24,21 @@
     "color": "#17191E",
     "theme": "dark"
   },
-  "version": "2.15.4",
+  "version": "2.16.0",
   "author": "withastro",
   "license": "MIT",
   "publisher": "astro-build",
   "engines": {
-    "vscode": "^1.82.0"
+    "vscode": "^1.90.0"
   },
   "activationEvents": [
-    "onLanguage:astro",
     "workspaceContains:astro.config.*"
   ],
   "main": "./dist/node/client.js",
   "repository": {
     "type": "git",
-    "url": "https://github.com/withastro/language-tools.git",
-    "directory": "packages/vscode"
+    "url": "https://github.com/withastro/astro.git",
+    "directory": "packages/language-tools/vscode"
   },
   "contributes": {
     "snippets": [
@@ -149,6 +148,12 @@
           "default": false,
           "description": "Enable experimental support for content collection intellisense inside Markdown, MDX and Markdoc. Note that this require also enabling the feature in your Astro config (experimental.contentCollectionIntellisense) (Astro 4.14+)"
         },
+        "astro.auto-import-cache.enabled": {
+          "scope": "resource",
+          "type": "boolean",
+          "default": true,
+          "markdownDescription": "Enable the auto import cache. Yields a faster intellisense when automatically importing a file, but can cause issues with new files not being detected. Change is applied on restart. See [#1035](https://github.com/withastro/language-tools/issues/1035)."
+        },
         "astro.updateImportsOnFileMove.enabled": {
           "scope": "resource",
           "type": "boolean",
@@ -230,19 +235,19 @@
     ]
   },
   "devDependencies": {
-    "@astrojs/language-server": "^2.15.4",
-    "@astrojs/ts-plugin": "^1.10.4",
+    "@astrojs/language-server": "^2.16.0",
+    "@astrojs/ts-plugin": "^1.10.5",
     "@types/glob": "^8.1.0",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^18.17.8",
+    "@types/node": "^20.9.0",
     "@types/vscode": "^1.82.0",
-    "@volar/language-server": "~2.4.7",
-    "@volar/vscode": "~2.4.7",
-    "@vscode/test-electron": "^2.3.2",
+    "@volar/language-server": "~2.4.23",
+    "@volar/vscode": "~2.4.23",
+    "@vscode/test-electron": "^2.5.2",
+    "@vscode/test-cli": "^0.0.12",
     "@vscode/vsce": "2.30.0",
     "esbuild": "^0.17.19",
     "esbuild-plugin-copy": "^2.1.1",
-    "glob": "^8.0.3",
     "js-yaml": "^4.1.0",
     "kleur": "^4.1.5",
     "mocha": "^10.2.0",
@@ -251,7 +256,7 @@
   },
   "dependencies": {
     "@astrojs/compiler": "^2.10.3",
-    "prettier": "^3.2.5",
+    "prettier": "^3.6.2",
     "prettier-plugin-astro": "^0.14.1"
   },
   "scripts": {
@@ -261,7 +266,7 @@
     "build:grammar": "node scripts/build-grammar.mjs",
     "dev:grammar": "node scripts/build-grammar.mjs -- --watch",
     "test": "pnpm test:vscode && pnpm test:grammar",
-    "test:vscode": "node ./test/runTest.js",
+    "test:vscode": "vscode-test",
     "test:grammar": "pnpm build:grammar && node ./test/grammar/test.mjs",
     "update-grammar-snapshots": "node ./test/grammar/test.mjs --updateSnapshot"
   }

package/src/client.ts

@@ -66,11 +66,16 @@ export async function activate(context: vscode.ExtensionContext): Promise<LabsIn
 	const hasContentIntellisense = vscode.workspace
 		.getConfiguration('astro')
 		.get('content-intellisense');
+
+	const shouldDisableAutoImportCache =
+		vscode.workspace.getConfiguration('astro').get('auto-import-cache.enabled') === false;
+
 	const initializationOptions = {
 		typescript: {
 			tsdk: (await getTsdk(context))!.tsdk,
 		},
 		contentIntellisense: hasContentIntellisense,
+		disableAutoImportCache: shouldDisableAutoImportCache,
 	} satisfies InitOptions;
 
 	const clientOptions = {

package/syntaxes/astro.tmLanguage.json

@@ -1,9 +1,7 @@
 {
   "name": "Astro",
   "scopeName": "source.astro",
-  "fileTypes": [
-    "astro"
-  ],
+  "fileTypes": ["astro"],
   "injections": {
     "L:(meta.script.astro) (meta.lang.json) - (meta source)": {
       "patterns": [
@@ -843,4 +841,4 @@
       ]
     }
   }
-}
+}

package/syntaxes/mdx.astro.tmLanguage.json

@@ -58,4 +58,4 @@
       ]
     }
   }
-}
+}

package/test/{suite/extension.test.js → extension.test.js}

@@ -1,4 +1,4 @@
-const assert = require('assert');
+const assert = require('node:assert');
 const vscode = require('vscode');
 
 suite('Extension Test Suite', () => {

package/test/grammar/test.mjs

@@ -1,7 +1,7 @@
-import { spawn } from 'child_process';
-import { readdirSync } from 'fs';
-import { dirname, join, resolve } from 'path';
-import { fileURLToPath } from 'url';
+import { spawn } from 'node:child_process';
+import { readdirSync } from 'node:fs';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 

package/tsconfig.json

@@ -1,9 +1,9 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../tsconfig.json",
   "compilerOptions": {
     "outDir": "dist",
-    "rootDir": "src",
-    "emitDeclarationOnly": true
+    "emitDeclarationOnly": true,
+    "checkJs": true
   },
-  "include": ["src"]
+  "include": ["src", ".vscode-test.js"]
 }

package/test/runTest.js

@@ -1,27 +0,0 @@
-const path = require('path');
-const { runTests } = require('@vscode/test-electron');
-
-async function main() {
-	// NOTE: Those tests are very flaky on Windows and macOS, so we'll skip them for now
-	if (process.platform === 'win32' || process.platform === 'darwin') {
-		process.exit(0);
-	}
-
-	try {
-		// The folder containing the Extension Manifest package.json
-		// Passed to `--extensionDevelopmentPath`
-		const extensionDevelopmentPath = path.resolve(__dirname, '../');
-
-		// The path to the extension test script
-		// Passed to --extensionTestsPath
-		const extensionTestsPath = path.resolve(__dirname, './suite/index.js');
-
-		// Download VS Code, unzip it and run the integration test
-		await runTests({ extensionDevelopmentPath, extensionTestsPath });
-	} catch {
-		console.error('Failed to run tests');
-		process.exit(1);
-	}
-}
-
-main();

package/test/suite/index.js

@@ -1,40 +0,0 @@
-const path = require('path');
-const Mocha = require('mocha');
-const glob = require('glob');
-
-exports.run = function () {
-	// Create the mocha test
-	const mocha = new Mocha({
-		ui: 'tdd',
-		color: true,
-	});
-
-	const testsRoot = path.resolve(__dirname, '..');
-
-	return /** @type {Promise<void>} */ (
-		new Promise((c, e) => {
-			glob('**/**.test.js', { cwd: testsRoot }, (err, files) => {
-				if (err) {
-					return e(err);
-				}
-
-				// Add files to the test suite
-				files.forEach((f) => mocha.addFile(path.resolve(testsRoot, f)));
-
-				try {
-					// Run the mocha test
-					mocha.run((failures) => {
-						if (failures > 0) {
-							e(new Error(`${failures} tests failed.`));
-						} else {
-							c();
-						}
-					});
-					// eslint-disable-next-line @typescript-eslint/no-shadow
-				} catch (err) {
-					e(err);
-				}
-			});
-		})
-	);
-};

package/test/tsconfig.json

@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig.json",
-  "compilerOptions": {
-    "module": "ES2020",
-    "target": "ES2020",
-    "moduleResolution": "node",
-    "allowJs": true,
-    "checkJs": true,
-    "rootDir": ".",
-    "emitDeclarationOnly": false,
-    "noEmit": true
-  },
-  "include": ["**/*.js", "grammar/test.mjs"]
-}