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

fix(plugin-sql-editor): CB-1174 parsing scripts

Browse Source
This commit is contained in:
Wroud
2021-10-10 22:12:26 +03:00
parent baab5a0507
commit 0279cfbee0
1 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webapp/packages/plugin-sql-editor/src/SQLParser.ts
+32 -30
View File
@@ -161,41 +161,43 @@ export class SQLParser {
if (currentSegment.endsWith(releaseChar)) {
ignore = false;
}
continue;
if (position < script.length) {
continue;
}
}
for (const scriptDelimiter of this.scriptDelimiters) {
if (currentSegment.endsWith(scriptDelimiter) || position === script.length) {
let query = currentSegment;
const scriptDelimiter = this.scriptDelimiters.find(scriptDelimiter => currentSegment.endsWith(scriptDelimiter));
if (position !== script.length) {
query = query.substr(0, query.length - scriptDelimiter.length);
}
if (scriptDelimiter || position === script.length) {
let query = currentSegment;
query = query.trim();
if (query) {
const begin = script.indexOf(query, position - currentSegment.length);
const end = begin + query.length;
const from = this.getScriptLineAtPos(begin);
const to = this.getScriptLineAtPos(end);
if (from && to) {
this._scripts.push({
query,
begin,
end,
from: from.index,
to: to.index,
fromPosition: begin - from.begin,
toPosition: end - to.begin,
});
}
}
currentSegment = '';
break;
if (scriptDelimiter) {
query = query.substr(0, query.length - scriptDelimiter.length);
}
query = query.trim();
if (query) {
const begin = script.indexOf(query, position - currentSegment.length);
const end = begin + query.length;
const from = this.getScriptLineAtPos(begin);
const to = this.getScriptLineAtPos(end);
if (from && to) {
this._scripts.push({
query,
begin,
end,
from: from.index,
to: to.index,
fromPosition: begin - from.begin,
toPosition: end - to.begin,
});
}
}
currentSegment = '';
}
for (const singleLineComment of this.singleLineComments) {