mirror of
https://github.com/usebruno/bruno.git
synced 2024-11-08 00:54:10 +01:00
Use Codemirror Hint feature for autocomplete
This commit is contained in:
parent
45042cd52a
commit
21edfbc25a
@ -9,6 +9,35 @@ const SERVER_RENDERED = typeof navigator === 'undefined' || global['PREVENT_CODE
|
|||||||
|
|
||||||
if (!SERVER_RENDERED) {
|
if (!SERVER_RENDERED) {
|
||||||
CodeMirror = require('codemirror');
|
CodeMirror = require('codemirror');
|
||||||
|
CodeMirror.registerHelper('hint', 'anyword', (editor, options) => {
|
||||||
|
const word = /[\w$]+/;
|
||||||
|
const wordlist = (options && options.autocomplete) || [];
|
||||||
|
let cur = editor.getCursor(),
|
||||||
|
curLine = editor.getLine(cur.line);
|
||||||
|
let end = cur.ch,
|
||||||
|
start = end;
|
||||||
|
while (start && word.test(curLine.charAt(start - 1))) --start;
|
||||||
|
let curWord = start != end && curLine.slice(start, end);
|
||||||
|
|
||||||
|
const list = (options && options.list) || [];
|
||||||
|
const re = new RegExp(word.source, 'g');
|
||||||
|
for (let dir = -1; dir <= 1; dir += 2) {
|
||||||
|
let line = cur.line,
|
||||||
|
endLine = Math.min(Math.max(line + dir * 500, editor.firstLine()), editor.lastLine()) + dir;
|
||||||
|
for (; line != endLine; line += dir) {
|
||||||
|
let text = editor.getLine(line),
|
||||||
|
m;
|
||||||
|
while ((m = re.exec(text))) {
|
||||||
|
if (line == cur.line && curWord.length < 3) continue;
|
||||||
|
list.push(...wordlist.filter((el) => el.toLowerCase().startsWith(curWord.toLowerCase())));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return { list: [...new Set(list)], from: CodeMirror.Pos(cur.line, start), to: CodeMirror.Pos(cur.line, end) };
|
||||||
|
});
|
||||||
|
CodeMirror.commands.autocomplete = (cm, hint, options) => {
|
||||||
|
cm.showHint({ hint, ...options });
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
class SingleLineEditor extends Component {
|
class SingleLineEditor extends Component {
|
||||||
@ -73,6 +102,14 @@ class SingleLineEditor extends Component {
|
|||||||
Tab: () => {}
|
Tab: () => {}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
if (this.props.autocomplete) {
|
||||||
|
this.editor.on('keyup', (cm, event) => {
|
||||||
|
if (!cm.state.completionActive /*Enables keyboard navigation in autocomplete list*/ && event.keyCode != 13) {
|
||||||
|
/*Enter - do not open autocomplete list just after item has been selected in it*/
|
||||||
|
CodeMirror.commands.autocomplete(cm, CodeMirror.hint.anyword, { autocomplete: this.props.autocomplete });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
this.editor.setValue(this.props.value || '');
|
this.editor.setValue(this.props.value || '');
|
||||||
this.editor.on('change', this._onEdit);
|
this.editor.on('change', this._onEdit);
|
||||||
this.addOverlay();
|
this.addOverlay();
|
||||||
|
Loading…
Reference in New Issue
Block a user