itdominator
/
LSP_Manager
generated from itdominator/Python-With-Gtk-Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-ordered commands and updated lsp settings

This commit is contained in:
itdominator 2024-09-21 01:12:55 -05:00
parent cc0117da78
commit de8fe47231
6 changed files with 55 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/controllers/lsp/lsp_controller_stdin_stdout.py
View File

@ -1,4 +1,5 @@
# Python imports # Python imports
import traceback
import subprocess import subprocess
# Lib imports # Lib imports
@ -42,7 +43,7 @@ class LSPControllerSTDInSTDOut(LSPControllerBase):
"2.0", "2.0",
None, None,
{ {
"error": repr(e) "error": traceback.format_exc()
} }
) )
) )
@ -114,4 +115,3 @@ class LSPControllerSTDInSTDOut(LSPControllerBase):
if not lsp_response: return if not lsp_response: return
GLib.idle_add(self.handle_lsp_response, lsp_response) GLib.idle_add(self.handle_lsp_response, lsp_response)

5
src/core/controllers/lsp/lsp_controller_websocket.py
View File

@ -1,4 +1,5 @@
# Python imports # Python imports
import traceback
import subprocess import subprocess
# Lib imports # Lib imports
@ -29,7 +30,7 @@ class LSPControllerWebsocket(LSPControllerBase):
if not self._start_command: return if not self._start_command: return
try: try:
self.lsp_process = subprocess.Popen( self.lsp_process = subprocess.Popen(
["pylsp", "--ws", "--port", "4114"], self._start_command,
stdout = subprocess.PIPE, stdout = subprocess.PIPE,
stdin = subprocess.PIPE stdin = subprocess.PIPE
) )
@ -40,7 +41,7 @@ class LSPControllerWebsocket(LSPControllerBase):
"2.0", "2.0",
None, None,
{ {
"error": repr(e) "error": traceback.format_exc()
} }
) )
) )

4
src/core/widgets/lsp_message_box.py
View File

@ -87,8 +87,8 @@ class LSPMessageBox(Gtk.Box):
def start_stop_lsp(self): def start_stop_lsp(self):
parent = self.get_parent() parent = self.get_parent()
_command: str = parent.alt_command_entry.get_text() _command: str = parent.command_entry.get_text()
# _command: str = parent.command_entry.get_text() # _command: str = parent.alt_command_entry.get_text()
# _command: str = parent.socket_entry.get_text() # _command: str = parent.socket_entry.get_text()
command: [] = _command.split() if len( _command.split() ) > 0 else [ _command ] command: [] = _command.split() if len( _command.split() ) > 0 else [ _command ]

8
src/core/widgets/lsp_ui.py
View File

@ -81,12 +81,12 @@ class LSPUI(Gtk.Grid):
# child, left, top, width, height # child, left, top, width, height
self.attach(self.link_btn, 0, 0, 3, 1) self.attach(self.link_btn, 0, 0, 3, 1)
self.attach(alt_command_lbl, 0, 1, 1, 1) self.attach(command_lbl, 0, 1, 1, 1)
self.attach(command_lbl, 0, 2, 1, 1) self.attach(alt_command_lbl, 0, 2, 1, 1)
self.attach(socket_lbl, 0, 3, 1, 1) self.attach(socket_lbl, 0, 3, 1, 1)
self.attach(self.alt_command_entry, 1, 1, 2, 1) self.attach(self.command_entry, 1, 1, 2, 1)
self.attach(self.command_entry, 1, 2, 2, 1) self.attach(self.alt_command_entry, 1, 2, 2, 1)
self.attach(self.socket_entry, 1, 3, 2, 1) self.attach(self.socket_entry, 1, 3, 2, 1)
self.attach(init_options_lbl, 0, 4, 3, 1) self.attach(init_options_lbl, 0, 4, 3, 1)

7
src/libs/lsp_endpoint_server.py
View File

@ -69,7 +69,6 @@ class LSPEndpointServer(Singleton):
start_time = time.perf_counter() start_time = time.perf_counter()
self._handle_ipc_message(conn, start_time) self._handle_ipc_message(conn, start_time)
except Exception as e: except Exception as e:
# logger.debug( repr(e) )
logger.debug( traceback.print_exc() ) logger.debug( traceback.print_exc() )
listener.close() listener.close()
@ -120,7 +119,7 @@ class LSPEndpointServer(Singleton):
except ConnectionRefusedError as e: except ConnectionRefusedError as e:
logger.error("Connection refused...") logger.error("Connection refused...")
except Exception as e: except Exception as e:
logger.error( repr(e) ) logger.debug( traceback.print_exc() )
def send_ipc_message(self, message: str = "Empty Data...") -> None: def send_ipc_message(self, message: str = "Empty Data...") -> None:
@ -137,7 +136,7 @@ class LSPEndpointServer(Singleton):
except ConnectionRefusedError as e: except ConnectionRefusedError as e:
logger.error("Connection refused...") logger.error("Connection refused...")
except Exception as e: except Exception as e:
logger.error( repr(e) ) logger.debug( traceback.print_exc() )
def send_test_ipc_message(self, message: str = "Empty Data...") -> None: def send_test_ipc_message(self, message: str = "Empty Data...") -> None:
try: try:
@ -155,4 +154,4 @@ class LSPEndpointServer(Singleton):
logger.error("LSP Socket no longer valid.... Removing.") logger.error("LSP Socket no longer valid.... Removing.")
os.unlink(self._ipc_address) os.unlink(self._ipc_address)
except Exception as e: except Exception as e:
logger.error( repr(e) ) logger.debug( traceback.print_exc() )

81
user_config/usr/share/lsp_manager/lsp-servers-config.json
View File

@ -1,45 +1,17 @@
{ {
"sh": { "sh": {
"info": "", "info": "",
"alt-command": "",
"command": "", "command": "",
"alt-command": "",
"socket": "ws://127.0.0.1:3030/?name=shell", "socket": "ws://127.0.0.1:3030/?name=shell",
"initialization-options": {} "initialization-options": {}
}, },
"python - pylsp": { "python": {
"hidden": true,
"info": "https://github.com/python-lsp/python-lsp-server",
"alt-command": "pylsp --ws --port 3030",
"command": "lsp-ws-proxy --listen 3030 -- pylsp",
"socket": "ws://127.0.0.1:3030/?name=pylsp",
"initialization-options": {
"pylsp": {
"plugins": {
"rope_autoimport": {
"enabled": true
},
"rope_completion": {
"enabled": false,
"eager": false
},
"jedi_completion": {
"fuzzy": true
},
"jedi":{
"extra_paths": [
"/home/abaddon/Portable_Apps/py-venvs/pylsp-venv/venv/lib/python3.10/site-packages"
]
}
}
}
}
},
"python3 - pylsp": {
"info": "https://github.com/python-lsp/python-lsp-server", "info": "https://github.com/python-lsp/python-lsp-server",
"command": "pylsp --ws --port 4114",
"alt-command": "pylsp", "alt-command": "pylsp",
"alt-command2": "pylsp --ws --port 3030", "alt-command2": "lsp-ws-proxy --listen 4114 -- pylsp",
"command": "lsp-ws-proxy --listen 3030 -- pylsp", "socket": "ws://127.0.0.1:4114/?name=pylsp",
"socket": "ws://127.0.0.1:3030/?name=pylsp",
"initialization-options": { "initialization-options": {
"pylsp": { "pylsp": {
"plugins": { "plugins": {
@ -75,11 +47,40 @@
} }
} }
}, },
"python3 - jedi-language-server": { "python - pylsp": {
"hidden": true,
"info": "https://github.com/python-lsp/python-lsp-server",
"command": "lsp-ws-proxy --listen 3030 -- pylsp",
"alt-command": "pylsp",
"alt-command2": "pylsp --ws --port 3030",
"socket": "ws://127.0.0.1:3030/?name=pylsp",
"initialization-options": {
"pylsp": {
"plugins": {
"rope_autoimport": {
"enabled": true
},
"rope_completion": {
"enabled": false,
"eager": false
},
"jedi_completion": {
"fuzzy": true
},
"jedi":{
"extra_paths": [
"/home/abaddon/Portable_Apps/py-venvs/pylsp-venv/venv/lib/python3.10/site-packages"
]
}
}
}
}
},
"python - jedi-language-server": {
"hidden": true, "hidden": true,
"info": "https://pypi.org/project/jedi-language-server/", "info": "https://pypi.org/project/jedi-language-server/",
"alt-command": "jedi-language-server",
"command": "lsp-ws-proxy --listen 3030 -- jedi-language-server", "command": "lsp-ws-proxy --listen 3030 -- jedi-language-server",
"alt-command": "jedi-language-server",
"socket": "ws://127.0.0.1:3030/?name=jedi-language-server", "socket": "ws://127.0.0.1:3030/?name=jedi-language-server",
"initialization-options": { "initialization-options": {
"jediSettings": { "jediSettings": {
@ -107,36 +108,36 @@
}, },
"c": { "c": {
"info": "https://clangd.llvm.org/", "info": "https://clangd.llvm.org/",
"alt-command": "clangd",
"command": "lsp-ws-proxy --listen 3030 -- clangd", "command": "lsp-ws-proxy --listen 3030 -- clangd",
"alt-command": "clangd",
"socket": "ws://127.0.0.1:3030/?name=clangd", "socket": "ws://127.0.0.1:3030/?name=clangd",
"initialization-options": {} "initialization-options": {}
}, },
"cpp": { "cpp": {
"info": "https://clangd.llvm.org/", "info": "https://clangd.llvm.org/",
"alt-command": "clangd",
"command": "lsp-ws-proxy --listen 3030 -- clangd", "command": "lsp-ws-proxy --listen 3030 -- clangd",
"alt-command": "clangd",
"socket": "ws://127.0.0.1:3030/?name=clangd", "socket": "ws://127.0.0.1:3030/?name=clangd",
"initialization-options": {} "initialization-options": {}
}, },
"java": { "java": {
"info": "https://download.eclipse.org/jdtls/", "info": "https://download.eclipse.org/jdtls/",
"alt-command": "java-language-server",
"command": "lsp-ws-proxy --listen 3030 -- java-language-server", "command": "lsp-ws-proxy --listen 3030 -- java-language-server",
"alt-command": "java-language-server",
"socket": "ws://127.0.0.1:3030/?name=java-language-server", "socket": "ws://127.0.0.1:3030/?name=java-language-server",
"initialization-options": {} "initialization-options": {}
}, },
"lua": { "lua": {
"info": "https://github.com/LuaLS/lua-language-server", "info": "https://github.com/LuaLS/lua-language-server",
"alt-command": "lua-language-server",
"command": "lsp-ws-proxy --listen 3030 -- lua-language-server", "command": "lsp-ws-proxy --listen 3030 -- lua-language-server",
"alt-command": "lua-language-server",
"socket": "ws://127.0.0.1:3030/?name=gopls", "socket": "ws://127.0.0.1:3030/?name=gopls",
"initialization-options": {} "initialization-options": {}
}, },
"go": { "go": {
"info": "https://pkg.go.dev/golang.org/x/tools/gopls#section-readme", "info": "https://pkg.go.dev/golang.org/x/tools/gopls#section-readme",
"alt-command": "gopls",
"command": "lsp-ws-proxy --listen 3030 -- gopls", "command": "lsp-ws-proxy --listen 3030 -- gopls",
"alt-command": "gopls",
"socket": "ws://127.0.0.1:3030/?name=gopls", "socket": "ws://127.0.0.1:3030/?name=gopls",
"initialization-options": {} "initialization-options": {}
} }