Merge branch 'main' into lsp/init-flow

Author: KRRT7

codeflash/lsp/beta.py

@@ -7,8 +7,6 @@
 from pathlib import Path
 from typing import TYPE_CHECKING, Optional
 
-from pygls import uris
-
 from codeflash.api.cfapi import get_codeflash_api_key, get_user_id
 from codeflash.cli_cmds.cli import process_pyproject_config
 from codeflash.cli_cmds.cmd_init import (
@@ -128,7 +126,11 @@ def _group_functions_by_file(
 def get_optimizable_functions(
     server: CodeflashLanguageServer, params: OptimizableFunctionsParams
 ) -> dict[str, list[str]]:
-    file_path = Path(uris.to_fs_path(params.textDocument.uri))
+    document_uri = params.textDocument.uri
+    document = server.workspace.get_text_document(document_uri)
+
+    file_path = Path(document.path)
+
     if not server.optimizer:
         return {"status": "error", "message": "optimizer not initialized"}
 
@@ -321,8 +323,10 @@ def provide_api_key(server: CodeflashLanguageServer, params: ProvideApiKeyParams
 def initialize_function_optimization(
     server: CodeflashLanguageServer, params: FunctionOptimizationInitParams
 ) -> dict[str, str]:
-    file_path = Path(uris.to_fs_path(params.textDocument.uri))
-    server.show_message_log(f"Initializing optimization for function: {params.functionName} in {file_path}", "Info")
+    document_uri = params.textDocument.uri
+    document = server.workspace.get_text_document(document_uri)
+
+    server.show_message_log(f"Initializing optimization for function: {params.functionName} in {document_uri}", "Info")
 
     if server.optimizer is None:
         _initialize_optimizer_if_api_key_is_valid(server)
@@ -332,7 +336,7 @@ def initialize_function_optimization(
     original_args, _ = server.optimizer.original_args_and_test_cfg
 
     server.optimizer.args.function = params.functionName
-    original_relative_file_path = file_path.relative_to(original_args.project_root)
+    original_relative_file_path = Path(document.path).relative_to(original_args.project_root)
     server.optimizer.args.file = server.optimizer.current_worktree / original_relative_file_path
     server.optimizer.args.previous_checkpoint_functions = False
 

codeflash/lsp/server.py

@@ -3,8 +3,8 @@
 from typing import TYPE_CHECKING, Any
 
 from lsprotocol.types import LogMessageParams, MessageType
+from pygls.lsp.server import LanguageServer
 from pygls.protocol import LanguageServerProtocol
-from pygls.server import LanguageServer
 
 if TYPE_CHECKING:
     from pathlib import Path
@@ -56,7 +56,7 @@ def show_message_log(self, message: str, message_type: str) -> None:
 
         # Send log message to client (appears in output channel)
         log_params = LogMessageParams(type=lsp_message_type, message=message)
-        self.lsp.notify("window/logMessage", log_params)
+        self.protocol.notify("window/logMessage", log_params)
 
     def cleanup_the_optimizer(self) -> None:
         self.current_optimization_init_result = None

pyproject.toml

@@ -41,7 +41,7 @@ dependencies = [
     "coverage>=7.6.4",
     "line_profiler>=4.2.0",
     "platformdirs>=4.3.7",
-    "pygls>=1.3.1",
+    "pygls>=2.0.0,<3.0.0",
     "codeflash-benchmark",
     "filelock",
 ]