dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-18 21:55:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

code completion context is only current query

Browse Source
This commit is contained in:
Jan Prochazka
2021-12-12 20:40:15 +01:00
parent 5e5a26ed4d
commit ccb25c9ff0
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/web/src/query/AceEditor.svelte
View File

@@ -96,6 +96,11 @@
return ''; return '';
} }
export function getCodeCompletionCommandText() {
if (currentPart != null) return currentPart.text;
return editor.getValue();
}
const requireEditorPlugins = () => {}; const requireEditorPlugins = () => {};
requireEditorPlugins(); requireEditorPlugins();

7
packages/web/src/query/SqlEditor.svelte
View File

@@ -39,7 +39,12 @@
$: effect = useEffect(() => { $: effect = useEffect(() => {
const editor = domEditor?.getEditor(); const editor = domEditor?.getEditor();
if ($tabVisible && conid && database && !readOnly && editor) { if ($tabVisible && conid && database && !readOnly && editor) {
return mountCodeCompletion({ conid, database, editor }); return mountCodeCompletion({
conid,
database,
editor,
getText: () => domEditor.getCodeCompletionCommandText(),
});
} }
return () => {}; return () => {};
}); });

4
packages/web/src/query/codeCompletion.ts
View File

@@ -23,7 +23,7 @@ const COMMON_KEYWORDS = [
'go', 'go',
]; ];
export function mountCodeCompletion({ conid, database, editor }) { export function mountCodeCompletion({ conid, database, editor, getText }) {
setCompleters([]); setCompleters([]);
addCompleter({ addCompleter({
getCompletions: async function (editor, session, pos, prefix, callback) { getCompletions: async function (editor, session, pos, prefix, callback) {
@@ -44,7 +44,7 @@ export function mountCodeCompletion({ conid, database, editor }) {
const lastKeywordMatch = line.match(/([a-zA-Z0-9_]*)\s*$/); const lastKeywordMatch = line.match(/([a-zA-Z0-9_]*)\s*$/);
const lastKeyword = lastKeywordMatch ? lastKeywordMatch[1].toUpperCase().trim() : ''; const lastKeyword = lastKeywordMatch ? lastKeywordMatch[1].toUpperCase().trim() : '';
const sources = analyseQuerySources(editor.getValue(), [ const sources = analyseQuerySources(getText(), [
...dbinfo.tables.map(x => x.pureName), ...dbinfo.tables.map(x => x.pureName),
...dbinfo.views.map(x => x.pureName), ...dbinfo.views.map(x => x.pureName),
...dbinfo.matviews.map(x => x.pureName), ...dbinfo.matviews.map(x => x.pureName),