diff --git a/crates/ide-lsp/tests/real_servers.rs b/crates/ide-lsp/tests/real_servers.rs index a76fca35..fb5b1330 100644 --- a/crates/ide-lsp/tests/real_servers.rs +++ b/crates/ide-lsp/tests/real_servers.rs @@ -297,7 +297,7 @@ fn npm_server(tools: &Path, name: &str, bin: &str, init: Option serde_json::Value { pub(crate) fn missing_typescript_message() -> String { "Vue Language Server needs TypeScript 5 or 6 (TypeScript 7 has no language service API). \ - Reinstall it in Settings › Languages & Frameworks › Language Servers, add typescript@\"<7\" \ + Reinstall it in Settings › Languages & Frameworks › Language Servers, add typescript@6 \ to the project, or pick a TypeScript version in Settings › Languages & Frameworks › TypeScript." .to_owned() } diff --git a/crates/ide-tools/src/lib.rs b/crates/ide-tools/src/lib.rs index e32d1002..1a87fea8 100644 --- a/crates/ide-tools/src/lib.rs +++ b/crates/ide-tools/src/lib.rs @@ -100,7 +100,7 @@ struct Manifest { const MANIFEST: &str = ".openidea-tool.json"; -/// `typescript@<7` → `typescript`, `@vue/language-server` unchanged. +/// `typescript@6` → `typescript`, `@vue/language-server` unchanged. fn npm_name(spec: &str) -> &str { match spec[1..].find('@') { Some(i) => &spec[..i + 1], diff --git a/crates/ide-tools/src/registry.rs b/crates/ide-tools/src/registry.rs index c3b2e9fd..b571b054 100644 --- a/crates/ide-tools/src/registry.rs +++ b/crates/ide-tools/src/registry.rs @@ -114,7 +114,7 @@ const fn ver(cmd: &'static str) -> Option<(&'static str, &'static [&'static str] /// The TypeScript these npm servers load as a library (`tsserver.js`, `ts.server`): /// TypeScript 7 (the native port) ships neither, and `@latest` resolves to it. -pub const TYPESCRIPT: &str = "typescript@<7"; +pub const TYPESCRIPT: &str = "typescript@6"; pub static TOOLS: &[ToolSpec] = &[ ToolSpec { diff --git a/crates/ide-tools/src/tests.rs b/crates/ide-tools/src/tests.rs index 02226cff..5711664b 100644 --- a/crates/ide-tools/src/tests.rs +++ b/crates/ide-tools/src/tests.rs @@ -335,7 +335,7 @@ done"#, } let installs = fs::read_to_string(&log).unwrap(); for line in installs.lines() { - assert!(line.contains("typescript@<7") && !line.contains("typescript@latest"), "{line}"); + assert!(line.contains("typescript@6") && !line.contains("typescript@latest"), "{line}"); } assert!(installs.contains("@vue/language-server@latest"), "{installs}"); diff --git a/languages/javascript.toml b/languages/javascript.toml index d16c1ad5..af10ad60 100644 --- a/languages/javascript.toml +++ b/languages/javascript.toml @@ -22,7 +22,7 @@ fallback = true command = "typescript-language-server" args = ["--stdio"] root-markers = ["jsconfig.json", "tsconfig.json", "package.json"] -install-hint = "npm i -g typescript@\"<7\" typescript-language-server" +install-hint = "npm i -g typescript@6 typescript-language-server" [debugger] adapter = "js-debug" diff --git a/languages/javascriptreact.toml b/languages/javascriptreact.toml index 540722ee..7dd3ae69 100644 --- a/languages/javascriptreact.toml +++ b/languages/javascriptreact.toml @@ -21,7 +21,7 @@ fallback = true command = "typescript-language-server" args = ["--stdio"] root-markers = ["jsconfig.json", "tsconfig.json", "package.json"] -install-hint = "npm i -g typescript@\"<7\" typescript-language-server" +install-hint = "npm i -g typescript@6 typescript-language-server" [debugger] adapter = "js-debug" diff --git a/languages/typescript.toml b/languages/typescript.toml index 536941b3..2de7b2cc 100644 --- a/languages/typescript.toml +++ b/languages/typescript.toml @@ -21,7 +21,7 @@ fallback = true command = "typescript-language-server" args = ["--stdio"] root-markers = ["tsconfig.json", "jsconfig.json", "package.json"] -install-hint = "npm i -g typescript@\"<7\" typescript-language-server" +install-hint = "npm i -g typescript@6 typescript-language-server" # Angular projects only: templates inline in components (`template: ...`), # and their usages and renames in templates. Last: TypeScript's own hover, diff --git a/languages/typescriptreact.toml b/languages/typescriptreact.toml index 8c5a439d..f1d8fc9c 100644 --- a/languages/typescriptreact.toml +++ b/languages/typescriptreact.toml @@ -21,7 +21,7 @@ fallback = true command = "typescript-language-server" args = ["--stdio"] root-markers = ["tsconfig.json", "jsconfig.json", "package.json"] -install-hint = "npm i -g typescript@\"<7\" typescript-language-server" +install-hint = "npm i -g typescript@6 typescript-language-server" [debugger] adapter = "js-debug" diff --git a/languages/vue.toml b/languages/vue.toml index 1176b0ec..a7cdade0 100644 --- a/languages/vue.toml +++ b/languages/vue.toml @@ -10,7 +10,7 @@ name = "vue-language-server" command = "vue-language-server" args = ["--stdio"] root-markers = ["package.json", "vite.config.ts", "vite.config.js", "nuxt.config.ts", "tsconfig.json"] -install-hint = "npm i -g @vue/language-server typescript@\"<7\"" +install-hint = "npm i -g @vue/language-server typescript@6" # Hybrid mode: TypeScript in `.vue` files comes from tsserver with # `@vue/typescript-plugin` (configured by the settings hook); vue-language-server