CHANGELOG.md

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.24.1](https://github.com/ajaxorg/ace/compare/v1.24.0...v1.24.1) (2023-08-15)
+
 ## [1.24.0](https://github.com/ajaxorg/ace/compare/v1.23.4...v1.24.0) (2023-08-09)
 
 

package.json

@@ -1,7 +1,7 @@
 {
     "name": "ace-code",
     "description": "Ajax.org Code Editor is a full featured source code highlighting editor that powers the Cloud9 IDE",
-    "version": "1.24.0",
+    "version": "1.24.1",
     "homepage": "http://github.com/ajaxorg/ace",
     "engines": {
         "node": ">= 0.6.0"

src/autocomplete.js

@@ -324,9 +324,9 @@ class Autocomplete {
         this.updateCompletions(false, options);
     }
 
-    getCompletionProvider() {
+    getCompletionProvider(initialPosition) {
         if (!this.completionProvider)
-            this.completionProvider = new CompletionProvider();
+            this.completionProvider = new CompletionProvider(initialPosition);
         return this.completionProvider;
     }
 
@@ -370,7 +370,10 @@ class Autocomplete {
         this.base = session.doc.createAnchor(pos.row, pos.column - prefix.length);
         this.base.$insertRight = true;
         var completionOptions = { exactMatch: this.exactMatch };
-        this.getCompletionProvider().provideCompletions(this.editor, completionOptions, function(err, completions, finished) {
+        this.getCompletionProvider({
+            prefix,
+            pos
+        }).provideCompletions(this.editor, completionOptions, function(err, completions, finished) {
             var filtered = completions.filtered;
             var prefix = util.getCompletionPrefix(this.editor);
 
@@ -588,8 +591,12 @@ Autocomplete.startCommand = {
  * This class is responsible for providing completions and inserting them to the editor
  */
 class CompletionProvider {
-
-    constructor() {
+
+    /**
+     * @param {{pos: Position, prefix: string}} initialPosition
+     */
+    constructor(initialPosition) {
+        this.initialPosition = initialPosition;
         this.active = true;
     }
 
@@ -611,20 +618,33 @@ class CompletionProvider {
             // TODO add support for options.deleteSuffix
             if (!this.completions)
                 return false;
-            if (this.completions.filterText) {
+
+            var replaceBefore = this.completions.filterText.length;
+            var replaceAfter = 0;
+            if (data.range && data.range.start.row === data.range.end.row) {
+                replaceBefore -= this.initialPosition.prefix.length;
+                replaceBefore += this.initialPosition.pos.column - data.range.start.column;
+                replaceAfter += data.range.end.column - this.initialPosition.pos.column;
+            }
+
+            if (replaceBefore || replaceAfter) {
                 var ranges;
                 if (editor.selection.getAllRanges) {
                     ranges = editor.selection.getAllRanges();
-                } else {
+                }
+                else {
                     ranges = [editor.getSelectionRange()];
                 }
                 for (var i = 0, range; range = ranges[i]; i++) {
-                    range.start.column -= this.completions.filterText.length;
+                    range.start.column -= replaceBefore;
+                    range.end.column += replaceAfter;
                     editor.session.remove(range);
                 }
             }
-            if (data.snippet)
-                snippetManager.insertSnippet(editor, data.snippet, {range: data.range});
+
+            if (data.snippet) {
+                snippetManager.insertSnippet(editor, data.snippet);
+            }
             else {
                 this.$insertString(editor, data);
             }
@@ -639,23 +659,7 @@ class CompletionProvider {
 
     $insertString(editor, data) {
         var text = data.value || data;
-        if (data.range) {
-            if (editor.inVirtualSelectionMode) {
-                return editor.session.replace(data.range, text);
-            }
-            editor.forEachSelection(() => {
-                var range = editor.getSelectionRange();
-                if (data.range.compareRange(range) === 0) {
-                    editor.session.replace(data.range, text);
-                }
-                else {
-                    editor.insert(text);
-                }
-            }, null, {keepOrder: true});
-        }
-        else {
-            editor.execCommand("insertstring", text);
-        }
+        editor.execCommand("insertstring", text);
     }
 
     gatherCompletions(editor, callback) {

src/autocomplete_test.js

@@ -32,6 +32,13 @@ function initEditor(value) {
     return editor;
 }
 
+function afterRenderCheck(popup, callback) {
+    popup.renderer.on("afterRender", function wait() {
+        popup.renderer.off("afterRender", wait);
+        callback();
+    });
+}
+
 module.exports = {
     tearDown: function() {
         if (editor) {
@@ -95,7 +102,7 @@ module.exports = {
                             snippet: "will: $1",
                             meta: "snippet",
                             command: "startAutocomplete",
-                            range: new Range(0, 4, 0, 6)
+                            range: new Range(0, 4, 0, 7)
                         }, {
                             caption: "here",
                             value: "-here",
@@ -110,28 +117,93 @@ module.exports = {
         editor.moveCursorTo(0, 6);
         sendKey("w");
         var popup = editor.completer.popup;
-        check(function () {
+        afterRenderCheck(popup, function () {
             assert.equal(popup.data.length, 1);
             editor.onCommandKey(null, 0, 13);
             assert.equal(popup.data.length, 2);
             assert.equal(editor.getValue(), "goodwill: ");
-            check(function () {
+            afterRenderCheck(popup, function () {
                 editor.onCommandKey(null, 0, 13);
                 assert.equal(editor.getValue(), "goodwill-here");
                 editor.destroy();
                 editor.container.remove();
                 done();
             });
         });
+    },
+    "test: correct completion replacement range when completion prefix has more than one letter": function (done) {
+        var editor = initEditor("<");
+
+        editor.completers = [
+            {
+                getCompletions: function (editor, session, pos, prefix, callback) {
+                    var completions = [
+                        {
+                            caption: "div",
+                            value: "div",
+                            range: new Range(0, 1, 0, 3)
+                        }, {
+                            caption: "dialog",
+                            value: "dialog",
+                            range: new Range(0, 1, 0, 3)
+                        }
+                    ];
+                    callback(null, completions);
+                }
+            }
+        ];
+
+        editor.moveCursorTo(0, 1);
+        sendKey("di");
+        var popup = editor.completer.popup;
+        check(function () {
+            assert.equal(popup.data.length, 2);
+            editor.onCommandKey(null, 0, 13);
+            check(function () {
+                assert.equal(editor.getValue(), "<dialog");
+                editor.destroy();
+                editor.container.remove();
+                done();
+            });
+        });
 
         function check(callback) {
-            popup = editor.completer.popup;
-            popup.renderer.on("afterRender", function wait() {
-                popup.renderer.off("afterRender", wait);
+            setTimeout(function wait() {
                 callback();
-            });
+            }, 10);
         }
     },
+    "test: symbols after selection are not removed when replacement range is present": function (done) {
+        var editor = initEditor("{}");
+        editor.completers = [
+            {
+                getCompletions: function (editor, session, pos, prefix, callback) {
+                    var completions = [
+                        {
+                            caption: "apple",
+                            snippet: "apple: $1",
+                            meta: "snippet",
+                            range: new Range(0, 1, 0, 2)
+                        }, {
+                            caption: "pineapple",
+                            value: "pineapple",
+                            range: new Range(0, 1, 0, 2)
+                        }
+                    ];
+                    callback(null, completions);
+                }
+            }
+        ];
+        editor.moveCursorTo(0, 1);
+        sendKey("a");
+        var popup = editor.completer.popup;
+        afterRenderCheck(popup, function () {
+            assert.equal(popup.data.length, 2);
+            editor.onCommandKey(null, 0, 13);
+            assert.equal(editor.getValue(), "{apple: }");
+            done();
+            });
+    },
     "test: different completers tooltips": function (done) {
         var editor = initEditor("");
         var firstDoc = "<b>First</b>";
@@ -183,6 +255,8 @@ module.exports = {
                 id: "secondCompleter"
             }
         ];
+
+
 
         sendKey("c");
         var popup = editor.completer.popup;

src/config.js

@@ -168,6 +168,6 @@ var reportErrorIfPathIsNotConfigured = function() {
     }
 };
 
-exports.version = "1.24.0";
+exports.version = "1.24.1";
 
 

src/ext/inline_autocomplete.js

@@ -165,9 +165,9 @@ class InlineAutocomplete {
         }
     }
 
-    getCompletionProvider() {
+    getCompletionProvider(initialPosition) {
         if (!this.completionProvider)
-            this.completionProvider = new CompletionProvider();
+            this.completionProvider = new CompletionProvider(initialPosition);
         return this.completionProvider;
     }
 
@@ -219,7 +219,11 @@ class InlineAutocomplete {
             exactMatch: true,
             ignoreCaption: true
         };
-        this.getCompletionProvider().provideCompletions(this.editor, options, function(err, completions, finished) {
+        this.getCompletionProvider({
+            prefix,
+            base: this.base,
+            pos
+        }).provideCompletions(this.editor, options, function(err, completions, finished) {
             var filtered = completions.filtered;
             var prefix = util.getCompletionPrefix(this.editor);
 

src/snippets.js

@@ -356,9 +356,6 @@ class SnippetManager {
         var processedSnippet = processSnippetText.call(this, editor, snippetText, options);
 
         var range = editor.getSelectionRange();
-        if (options.range && options.range.compareRange(range) === 0) {
-            range = options.range;
-        }
         var end = editor.session.replace(range, processedSnippet.text);
 
         var tabstopManager = new TabstopManager(editor);
@@ -368,8 +365,6 @@ class SnippetManager {
 
     insertSnippet(editor, snippetText, options={}) {
         var self = this;
-        if (options.range && !(options.range instanceof Range))
-            options.range = Range.fromPoints(options.range.start, options.range.end);
 
         if (editor.inVirtualSelectionMode)
             return self.insertSnippetForSelection(editor, snippetText, options);