Merge pull request #100 from UziTech/fix-prefix

Author: UziTech

lib/adapters/autocomplete-adapter.ts

@@ -103,7 +103,7 @@ export default class AutocompleteAdapter {
 
     // We must update the replacement prefix as characters are added and removed
     const cache = this._suggestionCache.get(server)!;
-    const replacementPrefix = request.editor.getTextInBufferRange([cache.triggerPoint, request.bufferPosition]);
+    const replacementPrefix = request.editor.getTextInBufferRange([cache.originalBufferPoint, request.bufferPosition]);
     for (const suggestion of suggestions) {
       if (suggestion.customReplacmentPrefix) { // having this property means a custom range was provided
         const len = replacementPrefix.length;

test/adapters/autocomplete-adapter.test.ts

@@ -483,6 +483,27 @@ describe('AutoCompleteAdapter', () => {
       result = (await autoCompleteAdapter.getSuggestions(server, customRequest))[0];
       expect(result.replacementPrefix).equals('#al');
     });
+
+    it('does not include the triggerChar in replacementPrefix', async () => {
+      const customRequest = createRequest({ prefix: '.', position: new Point(0, 4) });
+      customRequest.editor.setText('foo.');
+      server.capabilities.completionProvider!.triggerCharacters = ['.'];
+      sinon.stub(server.connection, 'completion').resolves([
+          createCompletionItem('bar'),
+      ]);
+      let result = (await autoCompleteAdapter.getSuggestions(server, customRequest))[0];
+      expect(result.replacementPrefix).equals('');
+      customRequest.editor.setTextInBufferRange([[0, 4], [0, 4]], 'b');
+      customRequest.prefix = 'b';
+      customRequest.bufferPosition = new Point(0, 5);
+      result = (await autoCompleteAdapter.getSuggestions(server, customRequest))[0];
+      expect(result.replacementPrefix).equals('b');
+      customRequest.editor.setTextInBufferRange([[0, 5], [0, 5]], 'a');
+      customRequest.prefix = 'ba';
+      customRequest.bufferPosition = new Point(0, 6);
+      result = (await autoCompleteAdapter.getSuggestions(server, customRequest))[0];
+      expect(result.replacementPrefix).equals('ba');
+    });
   });
 
   describe('completionKindToSuggestionType', () => {