opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-10-24 23:05:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(plugin-sql-editor): CB-1298 CB-1113 autocompletion

Browse Source
This commit is contained in:
Wroud
2021-10-03 00:42:29 +03:00
parent 9f5e01deaa
commit c7b49ed855
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditorController.tsx
+22 -5
View File
@@ -31,7 +31,7 @@ import { ISQLScriptSegment, SQLParser } from '../SQLParser';
import { SqlExecutionPlanService } from '../SqlResultTabs/ExecutionPlan/SqlExecutionPlanService';
import { SqlQueryService } from '../SqlResultTabs/SqlQueryService';
const closeCharacters = /[\s()[\]{};:>,=]/;
const closeCharacters = /[\s()[\]{};:>,=\\*]/;
@injectable()
export class SqlEditorController implements IInitializableController, IDestructibleController {
@@ -370,7 +370,7 @@ export class SqlEditorController implements IInitializableController, IDestructi
// TODO: probably should be moved to SQLCodeEditorController
editor.on('changes', (cm, changes) => {
this.resetLineStateHighlight();
if (!this.activeSuggest || editor.state.completionActive) {
if (!this.activeSuggest) {
return;
}
@@ -378,13 +378,21 @@ export class SqlEditorController implements IInitializableController, IDestructi
const origin = lastChange?.origin || '';
const change = lastChange?.text[0] || '';
const nextCursor = editor.getCursor('from');
if (nextCursor.line !== lastChange.from.line) {
editor.closeHint();
return;
}
if (
ignoredChanges.includes(origin)
editor.state.completionActive
|| ignoredChanges.includes(origin)
|| closeCharacters.test(change)) {
return;
}
cursor = editor.getCursor('from');
cursor = nextCursor;
this.showHint(true);
});
@@ -395,8 +403,17 @@ export class SqlEditorController implements IInitializableController, IDestructi
if (editor.state.completionActive) {
if (newCursor.ch !== cursor?.ch || newCursor.line !== cursor.line) {
const ch = newCursor.ch > cursor.ch
? editor.getRange(cursor, newCursor)
: editor.getRange(newCursor, cursor);
cursor = newCursor;
editor.state.completionActive.update();
if (closeCharacters.test(ch) || newCursor.line !== cursor.line) {
editor.closeHint();
} else {
editor.state.completionActive.update();
}
}
}
this.highlightActiveQuery();