Skip to content

Commit

Permalink
Fix issue #60
Browse files Browse the repository at this point in the history
  • Loading branch information
manateelazycat committed May 14, 2022
1 parent 9d8ead5 commit 256961d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion core/fileaction.py
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ def handle_completion_response(self, request_id, response_result):

def calc_completion_prefix_string(self):
ret = self.last_change_file_before_cursor_text
for c in self.lsp_server.trigger_characters + [" " + '\t']:
for c in self.lsp_server.completion_trigger_characters + [" " + '\t']:
ret = ret.rpartition(c)[2]
return ret

Expand Down
12 changes: 9 additions & 3 deletions core/lspserver.py
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ def __init__(self, message_queue, file_action):
self.ls_message_thread.start()

# LSP server information.
self.trigger_characters = list()
self.completion_trigger_characters = list()

# Start LSP sever.
self.p = subprocess.Popen(self.server_info["command"],
Expand Down Expand Up @@ -357,7 +357,7 @@ def send_completion_request(self, request_id, filepath, type, position, char):
self.record_request_id(request_id, method, filepath, type)

# STEP 6: Calculate completion candidates for current point.
if char in self.trigger_characters:
if char in self.completion_trigger_characters:
self.send_to_request(method,
{
"textDocument": {
Expand Down Expand Up @@ -493,7 +493,13 @@ def handle_recv_message(self, message):
if message["id"] == self.initialize_id:
# STEP 2: tell LSP server that client is ready.
# We need wait LSP server response 'initialize', then we send 'initialized' notification.
self.trigger_characters = message["result"]["capabilities"]["completionProvider"]["triggerCharacters"]
try:
# We pick up completion trigger characters from server.
# But some LSP server haven't this value, such as html/css LSP server.
self.completion_trigger_characters = message["result"]["capabilities"]["completionProvider"]["triggerCharacters"]
except:
pass

self.send_to_notification("initialized", {})
else:
if "error" in message.keys():
Expand Down

0 comments on commit 256961d

Please sign in to comment.