jab2870/Vim-Vixen
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix word splitter in completion

Browse source
This commit is contained in:
Shin'ya Ueoka 2017-10-11 20:44:09 +09:00
parent 7e70169d83
commit b2fad97cba
1 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/shared/commands.js
View file

@ -111,22 +111,34 @@ const doCommand = (line, settings) => {
throw new Error(name + ' command is not defined');
};
const getCompletions = (command, keywords, settings) => {
switch (command) {
const getCompletions = (line, settings) => {
let typedWords = line.trim().split(/ +/);
let typing = '';
if (!line.endsWith(' ')) {
typing = typedWords.pop();
}
if (typedWords.length === 0) {
return Promise.resolve([]);
}
let name = typedWords.shift();
let keywords = typedWords.concat(typing).join(' ');
switch (name) {
case 'o':
case 'open':
case 't':
case 'tabopen':
case 'w':
case 'winopen':
return getOpenCompletions(command, keywords, settings.search);
return getOpenCompletions(name, keywords, settings.search);
case 'b':
case 'buffer':
return tabs.getCompletions(keywords).then((gotTabs) => {
let items = gotTabs.map((tab) => {
return {
caption: tab.title,
content: command + ' ' + tab.title,
content: name + ' ' + tab.title,
url: tab.url,
icon: tab.favIconUrl
};
@ -147,9 +159,7 @@ const exec = (line, settings) => {
};
const complete = (line, settings) => {
let command = line.split(' ', 1)[0];
let keywords = line.replace(command + ' ', '');
return getCompletions(command, keywords, settings);
return getCompletions(line, settings);
};
export { exec, complete };