fix: marko prettier translator, test against vscode insiders

marko-js · Dec 6, 2023 · 1b66f99 · 1b66f99
1 parent 4ccd870
commit 1b66f99
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 17 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/language-server/package.json b/packages/language-server/package.json
@@ -15,7 +15,7 @@
     "htmljs-parser": "^5.5.1",
     "marko": "^5.32.0",
     "prettier": "^3.1.0",
-    "prettier-plugin-marko": "^3.1.1",
+    "prettier-plugin-marko": "^3.1.2",
     "relative-import-path": "^1.0.0",
     "strip-json-comments": "^3.1.1",
     "typescript": "^5.3.2",

diff --git a/packages/language-server/src/index.ts b/packages/language-server/src/index.ts
@@ -10,6 +10,7 @@ import {
 import type { TextDocument } from "vscode-languageserver-textdocument";
 import { Project } from "@marko/language-tools";
 
+import "./utils/project-defaults";
 import { clearMarkoCacheForFile } from "./utils/file";
 import * as documents from "./utils/text-documents";
 import * as workspace from "./utils/workspace";

diff --git a/packages/language-server/src/ts-plugin/host.ts b/packages/language-server/src/ts-plugin/host.ts
@@ -1,26 +1,14 @@
 import path from "path";
 import type ts from "typescript/lib/tsserverlibrary";
-import * as defaultCompiler from "@marko/compiler";
-import defaultConfig from "@marko/compiler/config";
-import * as defaultTranslator from "@marko/translator-default";
 import {
   type Extracted,
   Processors,
-  Project,
   getExt,
   isDefinitionFile,
 } from "@marko/language-tools";
 
 const fsPathReg = /^(?:[./\\]|[A-Z]:)/i;
 const modulePartsReg = /^((?:@(?:[^/]+)\/)?(?:[^/]+))(.*)$/;
-Project.setDefaultTypePaths({
-  internalTypesFile: path.join(__dirname, "marko.internal.d.ts"),
-  markoTypesFile: path.join(__dirname, "marko.runtime.d.ts"),
-});
-Project.setDefaultCompilerMeta(defaultCompiler, {
-  ...defaultConfig,
-  translator: defaultTranslator,
-});
 
 export interface ExtractedSnapshot extends Extracted {
   snapshot: ts.IScriptSnapshot;

diff --git a/packages/language-server/src/ts-plugin/index.ts b/packages/language-server/src/ts-plugin/index.ts
@@ -2,6 +2,7 @@ import type ts from "typescript/lib/tsserverlibrary";
 import { Extracted, Processors, Project } from "@marko/language-tools";
 import { START_POSITION } from "../utils/constants";
 import { ExtractedSnapshot, patch } from "./host";
+import "../utils/project-defaults";
 
 const markoTaglibFilesReg = /[\\/]marko(?:-tag)\.json$/;
 const getStartLineCharacter = () => START_POSITION;

diff --git a/packages/language-server/src/utils/project-defaults.ts b/packages/language-server/src/utils/project-defaults.ts
@@ -0,0 +1,14 @@
+import path from "path";
+import * as defaultCompiler from "@marko/compiler";
+import defaultConfig from "@marko/compiler/config";
+import * as defaultTranslator from "@marko/translator-default";
+import { Project } from "@marko/language-tools";
+
+Project.setDefaultTypePaths({
+  internalTypesFile: path.join(__dirname, "marko.internal.d.ts"),
+  markoTypesFile: path.join(__dirname, "marko.runtime.d.ts"),
+});
+Project.setDefaultCompilerMeta(defaultCompiler, {
+  ...defaultConfig,
+  translator: defaultTranslator,
+});
diff --git a/packages/vscode/test.mts b/packages/vscode/test.mts
@@ -13,6 +13,7 @@ process.once("exit", () => {
 });
 
 await runTests({
+  version: "insiders",
   extensionDevelopmentPath: pkgDir,
   extensionTestsPath: path.join(pkgDir, "dist/__tests__/index.js"),
 });