Skip to content

Commit f8b2bad

Browse files
authored
Merge pull request #122 from microsoft/revert-113-feature/clojure-lsp
Revert "Support for clojure via clojure-lsp"
2 parents 8989bc2 + 4cfbd3e commit f8b2bad

11 files changed

Lines changed: 8 additions & 766 deletions

File tree

.gitignore

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -397,15 +397,14 @@ FodyWeavers.xsd
397397
# JetBrains Rider
398398
*.sln.iml
399399

400-
# Downloaded language server binaries
401-
src/multilspy/language_servers/*/static/
400+
src/multilspy/language_servers/eclipse_jdtls/static/
401+
src/multilspy/language_servers/gopls/static/
402+
src/multilspy/language_servers/omnisharp/static/
403+
src/multilspy/language_servers/rust_analyzer/static/
404+
src/multilspy/language_servers/typescript_language_server/static/
405+
src/multilspy/language_servers/dart_language_server/static/
406+
src/multilspy/language_servers/clangd_language_server/static/
402407

403408
# Virtual Environment
404409
.venv/
405410
venv/
406-
407-
# clojure-related temporary files
408-
.calva/
409-
.clj-kondo/
410-
.cpcache/
411-
.lsp/

src/multilspy/language_server.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,6 @@ def create(cls, config: MultilspyConfig, logger: MultilspyLogger, repository_roo
122122
from multilspy.language_servers.clangd_language_server.clangd_language_server import ClangdLanguageServer
123123

124124
return ClangdLanguageServer(config, logger, repository_root_path)
125-
elif config.code_language == Language.CLOJURE:
126-
from multilspy.language_servers.clojure_lsp.clojure_lsp import ClojureLSP
127-
128-
return ClojureLSP(config, logger, repository_root_path)
129125
else:
130126
logger.log(f"Language {config.code_language} is not supported", logging.ERROR)
131127
raise MultilspyException(f"Language {config.code_language} is not supported")
@@ -384,7 +380,7 @@ async def request_definition(
384380

385381
if not self.server_started:
386382
self.logger.log(
387-
"request_definition called before Language Server started",
383+
"find_function_definition called before Language Server started",
388384
logging.ERROR,
389385
)
390386
raise MultilspyException("Language Server not started")

src/multilspy/language_servers/clojure_lsp/clojure_lsp.py

Lines changed: 0 additions & 174 deletions
This file was deleted.

src/multilspy/language_servers/clojure_lsp/initialize_params.json

Lines changed: 0 additions & 133 deletions
This file was deleted.

src/multilspy/language_servers/clojure_lsp/runtime_dependencies.json

Lines changed: 0 additions & 37 deletions
This file was deleted.

src/multilspy/multilspy_config.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ class Language(str, Enum):
2121
RUBY = "ruby"
2222
DART = "dart"
2323
CPP = "cpp"
24-
CLOJURE = "clojure"
2524

2625
def __str__(self) -> str:
2726
return self.value

0 commit comments

Comments
 (0)