@astrojs/language-server 2.5.3 → 2.5.5

package/dist/check.d.ts

@@ -21,6 +21,7 @@ export declare class AstroCheck {
     private ts;
     project: ReturnType<typeof kit.createProject>;
     private linter;
+    private skipJSX;
     constructor(workspacePath: string, typescriptPath: string | undefined, tsconfigPath: string | undefined);
     /**
      * Lint a list of files or the entire project and optionally log the errors found

package/dist/check.js

@@ -45,6 +45,8 @@ class AstroCheck {
         this.workspacePath = workspacePath;
         this.typescriptPath = typescriptPath;
         this.tsconfigPath = tsconfigPath;
+        // TODO: Remove this when the JSX typing issue is fixed
+        this.skipJSX = false;
         this.initialize();
     }
     /**
@@ -54,7 +56,10 @@ class AstroCheck {
      * @return {CheckResult} The result of the lint, including a list of errors, the file's content and its file path.
      */
     async lint({ fileNames = undefined, cancel = () => false, logErrors = undefined, }) {
-        const files = fileNames !== undefined ? fileNames : this.project.languageHost.getScriptFileNames();
+        let files = fileNames !== undefined ? fileNames : this.project.languageHost.getScriptFileNames();
+        if (this.skipJSX) {
+            files = files.filter((file) => !file.endsWith('.jsx') && !file.endsWith('.tsx'));
+        }
         const result = {
             status: undefined,
             fileChecked: 0,
@@ -134,6 +139,11 @@ class AstroCheck {
                 });
             });
         }
+        const files = this.project.languageHost.getScriptFileNames();
+        if (files.some((file) => file.endsWith('.jsx') || file.endsWith('.tsx'))) {
+            console.warn('\x1b[33;1mWARNING:\x1b[0m Checking `.jsx` and `.tsx` files is temporarily disabled due to an issue in the Astro language server and TypeScript. See https://github.com/withastro/language-tools/issues/727 for more details. In the meantime, such files can be checked using `tsc --noEmit`.');
+            this.skipJSX = true;
+        }
         this.linter = kit.createLinter(config, this.project.languageHost);
     }
     getTsconfig() {

package/dist/core/parseJS.js

@@ -157,7 +157,10 @@ function findEventAttributes(ast) {
                 const eventAttribute = child.attributes.find((attr) => htmlEventAttributes.includes(attr.name) && attr.kind === 'quoted');
                 if (eventAttribute && eventAttribute.position) {
                     eventAttrs.push({
-                        content: eventAttribute.value,
+                        // Add a semicolon to the end of the event attribute to attempt to prevent errors from spreading to the rest of the document
+                        // This is not perfect, but it's better than nothing
+                        // See: https://github.com/microsoft/vscode/blob/e8e04769ec817a3374c3eaa26a08d3ae491820d5/extensions/html-language-features/server/src/modes/embeddedSupport.ts#L192
+                        content: eventAttribute.value + ';',
                         startOffset: eventAttribute.position.start.offset + `${eventAttribute.name}="`.length,
                     });
                 }

package/dist/plugins/typescript/diagnostics.d.ts

@@ -9,4 +9,4 @@ export declare enum DiagnosticCodes {
     JSX_NO_CLOSING_TAG = 17008,
     JSX_ELEMENT_NO_CALL = 2604
 }
-export declare function enhancedProvideSemanticDiagnostics(originalDiagnostics: Diagnostic[], documentLineCount: number): Diagnostic[];
+export declare function enhancedProvideSemanticDiagnostics(originalDiagnostics: Diagnostic[], astroLineCount?: number | undefined): Diagnostic[];

package/dist/plugins/typescript/diagnostics.js

@@ -14,20 +14,31 @@ var DiagnosticCodes;
     DiagnosticCodes[DiagnosticCodes["JSX_NO_CLOSING_TAG"] = 17008] = "JSX_NO_CLOSING_TAG";
     DiagnosticCodes[DiagnosticCodes["JSX_ELEMENT_NO_CALL"] = 2604] = "JSX_ELEMENT_NO_CALL";
 })(DiagnosticCodes || (exports.DiagnosticCodes = DiagnosticCodes = {}));
-function enhancedProvideSemanticDiagnostics(originalDiagnostics, documentLineCount) {
+function enhancedProvideSemanticDiagnostics(originalDiagnostics, astroLineCount) {
     const diagnostics = originalDiagnostics
-        .filter((diagnostic) => diagnostic.range.start.line <= documentLineCount &&
+        .filter((diagnostic) => (astroLineCount ? diagnostic.range.start.line <= astroLineCount : true) &&
         isNoCantReturnOutsideFunction(diagnostic) &&
         isNoIsolatedModuleError(diagnostic) &&
         isNoJsxCannotHaveMultipleAttrsError(diagnostic))
-        .map(enhanceIfNecessary);
+        .map((diag) => astroLineCount ? generalEnhancements(astroEnhancements(diag)) : generalEnhancements(diag));
     return diagnostics;
 }
 exports.enhancedProvideSemanticDiagnostics = enhancedProvideSemanticDiagnostics;
+// General enhancements that apply to all files
+function generalEnhancements(diagnostic) {
+    if (diagnostic.code === DiagnosticCodes.CANNOT_FIND_MODULE &&
+        diagnostic.message.includes('astro:content')) {
+        diagnostic.message +=
+            "\n\nIf you're using content collections, make sure to run `astro dev`, `astro build` or `astro sync` to first generate the types so you can import from them. If you already ran one of those commands, restarting the language server might be necessary in order for the change to take effect.";
+        return diagnostic;
+    }
+    return diagnostic;
+}
 /**
- * Some diagnostics have JSX-specific nomenclature or unclear description. Enhance them for more clarity.
+ * Astro-specific enhancements. For instance, when the user tries to import a component from a framework that is not installed
+ * or a difference with JSX needing a different error message
  */
-function enhanceIfNecessary(diagnostic) {
+function astroEnhancements(diagnostic) {
     // When the language integrations are not installed, the content of the imported snapshot is empty
     // As such, it triggers the "is not a module error", which we can enhance with a more helpful message for the related framework
     if (diagnostic.code === DiagnosticCodes.IS_NOT_A_MODULE) {
@@ -41,12 +52,6 @@ function enhanceIfNecessary(diagnostic) {
         }
         return diagnostic;
     }
-    if (diagnostic.code === DiagnosticCodes.CANNOT_FIND_MODULE &&
-        diagnostic.message.includes('astro:content')) {
-        diagnostic.message +=
-            "\n\nIf you're using content collections, make sure to run `astro dev`, `astro build` or `astro sync` to first generate the types so you can import from them. If you already ran one of those commands, restarting the language server might be necessary in order for the change to take effect.";
-        return diagnostic;
-    }
     // JSX element has no closing tag. JSX -> HTML
     if (diagnostic.code === DiagnosticCodes.JSX_NO_CLOSING_TAG) {
         return {

package/dist/plugins/typescript/index.js

@@ -112,16 +112,17 @@ const create = () => (context, modules) => {
         async provideSemanticDiagnostics(document, token) {
             const [_, source] = context.documents.getVirtualFileByUri(document.uri);
             const file = source?.root;
-            if (!(file instanceof index_js_1.AstroFile))
-                return null;
-            // If we have compiler errors, our TSX isn't valid so don't bother showing TS errors
-            if (file.hasCompilationErrors)
-                return null;
+            let astroDocument = undefined;
+            if (file instanceof index_js_1.AstroFile) {
+                // If we have compiler errors, our TSX isn't valid so don't bother showing TS errors
+                if (file.hasCompilationErrors)
+                    return null;
+                astroDocument = context.documents.getDocumentByFileName(file.snapshot, file.sourceFileName);
+            }
             const diagnostics = await typeScriptPlugin.provideSemanticDiagnostics(document, token);
             if (!diagnostics)
                 return null;
-            const astroDocument = context.documents.getDocumentByFileName(file.snapshot, file.sourceFileName);
-            return (0, diagnostics_js_1.enhancedProvideSemanticDiagnostics)(diagnostics, astroDocument.lineCount);
+            return (0, diagnostics_js_1.enhancedProvideSemanticDiagnostics)(diagnostics, astroDocument?.lineCount);
         },
     };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "2.5.3",
+  "version": "2.5.5",
   "author": "withastro",
   "license": "MIT",
   "repository": {