Merge pull request apache#4728 from matthiasblaesing/lsp_insert

LSP Client: Use full complete item to complete, not just the missing suffix
canpse · Nov 25, 2022 · e2468f0 · e2468f0
2 parents 991f962 + b4a0990
commit e2468f0
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/CompletionProviderImpl.java b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/CompletionProviderImpl.java
@@ -213,9 +213,14 @@ private void commit(String appendText) {
                                                 toAdd = i.getLabel();
                                             }
                                             int[] identSpan = Utilities.getIdentifierBlock((BaseDocument) doc, caretOffset);
-                                            String printSuffix = toAdd.substring(identSpan != null ? caretOffset - identSpan[0] : 0);
-                                            doc.insertString(caretOffset, printSuffix, null);
-                                            endPos = caretOffset + printSuffix.length();
+                                            if (identSpan != null) {
+                                                doc.remove(identSpan[0], identSpan[1] - identSpan[0]);
+                                                doc.insertString(identSpan[0], toAdd, null);
+                                                endPos = identSpan[0] + toAdd.length();
+                                            } else {
+                                                doc.insertString(caretOffset, toAdd, null);
+                                                endPos = caretOffset + toAdd.length();
+                                            }
                                         }
                                         doc.insertString(endPos, appendText, null);
                                     } catch (BadLocationException ex) {