maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

use selected text with non empty selection, fixes #9762

Browse source
This commit is contained in:
Johannes Rieken 2016-07-26 15:59:39 +02:00
parent 3a9b0ec334
commit 1518e267b6
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/vs/editor/contrib/suggest/browser/tabCompletion.ts
View file

@ -5,7 +5,6 @@
'use strict';
import * as strings from 'vs/base/common/strings';
import {KeyCode} from 'vs/base/common/keyCodes';
import {ICodeEditorService} from 'vs/editor/common/services/codeEditorService';
import {IKeybindingService, KbExpr} from 'vs/platform/keybinding/common/keybinding';
@ -34,12 +33,17 @@ class TabCompletionController implements editor.IEditorContribution {
) {
this._snippetController = getSnippetController(editor);
const hasSnippets = keybindingService.createKey(TabCompletionController.ContextKey, undefined);
this._cursorChangeSubscription = editor.onDidChangeCursorPosition(e => {
this._cursorChangeSubscription = editor.onDidChangeCursorSelection(e => {
this._currentSnippets.length = 0;
const prefix = getNonWhitespacePrefix(editor.getModel(), editor.getPosition());
const prefix = e.selection.isEmpty()
? getNonWhitespacePrefix(editor.getModel(), editor.getPosition())
: editor.getModel().getValueInRange(e.selection);
if (prefix) {
snippetsRegistry.visitSnippets(editor.getModel().getModeId(), s => {
if (strings.endsWith(prefix, s.prefix)) {
if (prefix === s.prefix) {
this._currentSnippets.push(s);
}
return true;