From ba74c059700e6d2641a877110d00d61f6ffcbb3d Mon Sep 17 00:00:00 2001 From: Michael Panchenko Date: Mon, 23 Jun 2025 21:00:20 +0200 Subject: [PATCH] Removed javascript from languages (just ts is enough), enhanced ts file matching --- src/solidlsp/ls.py | 2 +- src/solidlsp/ls_config.py | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/solidlsp/ls.py b/src/solidlsp/ls.py index 0d4dcaa8..cf5f3bb1 100644 --- a/src/solidlsp/ls.py +++ b/src/solidlsp/ls.py @@ -144,7 +144,7 @@ class SolidLanguageServer(ABC): return OmniSharp(config, logger, repository_root_path) - elif config.code_language in [Language.TYPESCRIPT, Language.JAVASCRIPT]: + elif config.code_language == Language.TYPESCRIPT: from solidlsp.language_servers.typescript_language_server.typescript_language_server import ( TypeScriptLanguageServer, ) diff --git a/src/solidlsp/ls_config.py b/src/solidlsp/ls_config.py index 27deaf15..abe9e273 100644 --- a/src/solidlsp/ls_config.py +++ b/src/solidlsp/ls_config.py @@ -32,7 +32,6 @@ class Language(str, Enum): JAVA = "java" KOTLIN = "kotlin" TYPESCRIPT = "typescript" - JAVASCRIPT = "javascript" GO = "go" RUBY = "ruby" DART = "dart" @@ -49,9 +48,13 @@ class Language(str, Enum): case self.JAVA: return FilenameMatcher("*.java") case self.TYPESCRIPT: - return FilenameMatcher("*.ts", "*.js", "*.jsx", "*.tsx") - case self.JAVASCRIPT: - return FilenameMatcher("*.js", "*.jsx") + # see https://github.com/oraios/serena/issues/204 + path_patterns = [] + for prefix in ["c", "m", ""]: + for postfix in ["x", ""]: + for base_pattern in ["ts", "js"]: + path_patterns.append(f"*.{prefix}{base_pattern}{postfix}") + return FilenameMatcher(*path_patterns) case self.CSHARP: return FilenameMatcher("*.cs") case self.RUST: