Merge pull request #527 from machitgarha/fix-duplicating-autocompletion

Fix autocompletion leading to duplicated symbols and tokens
Gert-dev · Jul 25, 2022 · bf8b7eb · bf8b7eb
2 parents 5c72473 + fe432ca
commit bf8b7eb
Show file tree

Hide file tree

Showing 3 changed files with 250 additions and 68 deletions.
diff --git a/lib/SerenataClient.js b/lib/SerenataClient.js
@@ -426,7 +426,17 @@ class SerenataClient extends AutoLanguageClient
         });
     }
 
-    onDidConvertAutocomplete(completionItem, suggestion/*, request*/) {
+    onDidConvertAutocomplete(completionItem, suggestion, request) {
+        const textEdit = completionItem.textEdit;
+
+        // TODO: Workaround for https://github.com/atom-community/atom-languageclient/pull/207
+        if (textEdit && textEdit.newText.substring(0, 2) === '\\$') {
+            suggestion.customReplacmentPrefix = request.editor.getTextInBufferRange([
+                [textEdit.range.start.line, textEdit.range.start.character],
+                request.bufferPosition
+            ]);
+        }
+
         suggestion.className = 'php-ide-serenata-autocompletion-suggestion';
 
         if (completionItem.deprecated) {
@@ -461,26 +471,6 @@ class SerenataClient extends AutoLanguageClient
         suggestion.rightLabel = detailParts.join(' — ');
     }
 
-    onDidInsertSuggestion({editor/*, triggerPosition*/, suggestion}) {
-        const additionalTextEdits = suggestion.completionItem.additionalTextEdits;
-
-        if (!additionalTextEdits || additionalTextEdits.length === 0) {
-            return;
-        }
-
-        return editor.transact(() => {
-            return additionalTextEdits.map((additionalTextEdit) => {
-                editor.setTextInBufferRange(
-                    [
-                        [additionalTextEdit.range.start.line, additionalTextEdit.range.start.character],
-                        [additionalTextEdit.range.end.line, additionalTextEdit.range.end.character]
-                    ],
-                    additionalTextEdit.newText
-                );
-            });
-        });
-    }
-
     onOpenTextDocument(parameters) {
         const {Convert} = require('atom-languageclient');