jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use data.snippet in completions for snippet insertion

Browse source
This commit is contained in:
DanyaPostfactum 2013-07-01 01:23:14 +10:00
commit 7ce86e24f1
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/ace/autocomplete.js
View file

@ -137,14 +137,15 @@ var Autocomplete = function() {
if (data.completer && data.completer.insertMatch) { if (data.completer && data.completer.insertMatch) {
data.completer.insertMatch(this.editor); data.completer.insertMatch(this.editor);
} else { } else {
if (data.value)
data = data.value;
if (this.completions.filterText) { if (this.completions.filterText) {
var range = this.editor.selection.getRange(); var range = this.editor.selection.getRange();
range.start.column -= this.completions.filterText.length; range.start.column -= this.completions.filterText.length;
this.editor.session.remove(range); this.editor.session.remove(range);
} }
snippetManager.insertSnippet(this.editor, data); if (data.snippet)
snippetManager.insertSnippet(this.editor, data.snippet);
else
this.editor.insert(data.value || data);
} }
}; };

4
lib/ace/ext/language_tools.js
View file

@ -65,8 +65,8 @@ var snippetCompleter = {
if (s.tabTrigger && s.tabTrigger.indexOf(prefix) === 0) if (s.tabTrigger && s.tabTrigger.indexOf(prefix) === 0)
completions.push({ completions.push({
caption: s.tabTrigger, caption: s.tabTrigger,
value: s.content, snippet: s.content,
meta: 'snippet' meta: "snippet"
}); });
} }
}, this); }, this);