Fix #18 Proposal exit position should point to correct location

It should point to $0 if present
lxtk-org · Aug 6, 2020 · b30b70d · b30b70d
1 parent c5cba1e
commit b30b70d
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/org.lxtk.lx4e.ui/src/org/lxtk/lx4e/ui/completion/LSIncompleteCompletionProposal.java b/org.lxtk.lx4e.ui/src/org/lxtk/lx4e/ui/completion/LSIncompleteCompletionProposal.java
@@ -549,7 +549,16 @@ protected void apply(IDocument document, char trigger, int stateMask, int offset
 
                 LinkedModeUI ui = new EditorLinkedModeUI(model, viewer);
                 // ui.setExitPolicy(new ExitPolicy(closingCharacter, document));
-                ui.setExitPosition(viewer, insertionOffset + textEdit.getNewText().length(), 0, Integer.MAX_VALUE);
+                List<LinkedPosition> exitPositions = regions.get(String.valueOf(0));
+                int exitOffset = 0;
+                int exitLength = 0;
+                if (exitPositions != null && exitPositions.size() == 1) {
+                    exitOffset = exitPositions.get(0).getOffset();
+                    exitLength = exitPositions.get(0).getLength();
+                } else {
+                    exitOffset = insertionOffset + textEdit.getNewText().length();
+                }
+                ui.setExitPosition(viewer, exitOffset, exitLength, Integer.MAX_VALUE);
                 ui.setCyclingMode(LinkedModeUI.CYCLE_WHEN_NO_PARENT);
                 // ui.setDoContextInfo(true);
                 ui.enter();