Skip to content

Commit a3e6d1e

Browse files
JackWang032JackWang032
committed
Merge remote-tracking branch 'refs/remotes/origin/next' into next
2 parents cbf809c + 5fccaa1 commit a3e6d1e

File tree

23 files changed

+335
-75
lines changed

23 files changed

+335
-75
lines changed

‎src/parser/common/basicSQL.ts‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,13 @@ export abstract class BasicSQL<
7373
/**
7474
* Convert candidates to suggestions
7575
* @param candidates candidate list
76-
* @param allTokens all tokens from input
76+
* @param allTokens slice all tokens from input by tokenIndexOffset
7777
* @param caretTokenIndex tokenIndex of caretPosition
78-
* @param tokenIndexOffset offset of the tokenIndex in the candidates compared to the tokenIndex in allTokens
7978
*/
8079
protected abstract processCandidates(
8180
candidates: CandidatesCollection,
8281
allTokens: Token[],
83-
caretTokenIndex: number,
84-
tokenIndexOffset: number
82+
caretTokenIndex: number
8583
): Suggestions<Token>;
8684

8785
/**
@@ -539,13 +537,7 @@ export abstract class BasicSQL<
539537
core.preferredRules = this.preferredRules;
540538

541539
const candidates = core.collectCandidates(caretTokenIndex, parseTree);
542-
const originalSuggestions = this.processCandidates(
543-
candidates,
544-
allTokens,
545-
caretTokenIndex,
546-
0
547-
// tokenIndexOffset
548-
);
540+
const originalSuggestions = this.processCandidates(candidates, allTokens, caretTokenIndex);
549541

550542
const syntaxSuggestions: SyntaxSuggestion<WordRange>[] = originalSuggestions.syntax.map(
551543
(syntaxCtx) => {

‎src/parser/flink/index.ts‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,19 +71,15 @@ export class FlinkSQL extends BasicSQL<FlinkSqlLexer, ProgramContext, FlinkSqlPa
7171
protected processCandidates(
7272
candidates: CandidatesCollection,
7373
allTokens: Token[],
74-
caretTokenIndex: number,
75-
tokenIndexOffset: number
74+
caretTokenIndex: number
7675
): Suggestions<Token> {
7776
const originalSyntaxSuggestions: SyntaxSuggestion<Token>[] = [];
7877
const keywords: string[] = [];
7978

8079
for (let candidate of candidates.rules) {
8180
const [ruleType, candidateRule] = candidate;
82-
const startTokenIndex = candidateRule.startTokenIndex + tokenIndexOffset;
83-
const tokenRanges = allTokens.slice(
84-
startTokenIndex,
85-
caretTokenIndex + tokenIndexOffset + 1
86-
);
81+
const tokenRanges = allTokens.slice(candidateRule.startTokenIndex, caretTokenIndex + 1);
82+
8783
let syntaxContextType: EntityContextType | StmtContextType | undefined = void 0;
8884
switch (ruleType) {
8985
case FlinkSqlParser.RULE_catalogPath: {

‎src/parser/hive/index.ts‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,18 +69,13 @@ export class HiveSQL extends BasicSQL<HiveSqlLexer, ProgramContext, HiveSqlParse
6969
protected processCandidates(
7070
candidates: CandidatesCollection,
7171
allTokens: Token[],
72-
caretTokenIndex: number,
73-
tokenIndexOffset: number
72+
caretTokenIndex: number
7473
): Suggestions<Token> {
7574
const originalSyntaxSuggestions: SyntaxSuggestion<Token>[] = [];
7675
const keywords: string[] = [];
7776
for (let candidate of candidates.rules) {
7877
const [ruleType, candidateRule] = candidate;
79-
const startTokenIndex = candidateRule.startTokenIndex + tokenIndexOffset;
80-
const tokenRanges = allTokens.slice(
81-
startTokenIndex,
82-
caretTokenIndex + tokenIndexOffset + 1
83-
);
78+
const tokenRanges = allTokens.slice(candidateRule.startTokenIndex, caretTokenIndex + 1);
8479

8580
let syntaxContextType: EntityContextType | StmtContextType | undefined = void 0;
8681
switch (ruleType) {

‎src/parser/impala/index.ts‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,18 +67,13 @@ export class ImpalaSQL extends BasicSQL<ImpalaSqlLexer, ProgramContext, ImpalaSq
6767
protected processCandidates(
6868
candidates: CandidatesCollection,
6969
allTokens: Token[],
70-
caretTokenIndex: number,
71-
tokenIndexOffset: number
70+
caretTokenIndex: number
7271
): Suggestions<Token> {
7372
const originalSyntaxSuggestions: SyntaxSuggestion<Token>[] = [];
7473
const keywords: string[] = [];
7574
for (let candidate of candidates.rules) {
7675
const [ruleType, candidateRule] = candidate;
77-
const startTokenIndex = candidateRule.startTokenIndex + tokenIndexOffset;
78-
const tokenRanges = allTokens.slice(
79-
startTokenIndex,
80-
caretTokenIndex + tokenIndexOffset + 1
81-
);
76+
const tokenRanges = allTokens.slice(candidateRule.startTokenIndex, caretTokenIndex + 1);
8277

8378
let syntaxContextType: EntityContextType | StmtContextType | undefined = void 0;
8479
switch (ruleType) {

‎src/parser/mysql/index.ts‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,19 +66,14 @@ export class MySQL extends BasicSQL<MySqlLexer, ProgramContext, MySqlParser> {
6666
protected processCandidates(
6767
candidates: CandidatesCollection,
6868
allTokens: Token[],
69-
caretTokenIndex: number,
70-
tokenIndexOffset: number
69+
caretTokenIndex: number
7170
): Suggestions<Token> {
7271
const originalSyntaxSuggestions: SyntaxSuggestion<Token>[] = [];
7372
const keywords: string[] = [];
7473

7574
for (const candidate of candidates.rules) {
7675
const [ruleType, candidateRule] = candidate;
77-
const startTokenIndex = candidateRule.startTokenIndex + tokenIndexOffset;
78-
const tokenRanges = allTokens.slice(
79-
startTokenIndex,
80-
caretTokenIndex + tokenIndexOffset + 1
81-
);
76+
const tokenRanges = allTokens.slice(candidateRule.startTokenIndex, caretTokenIndex + 1);
8277

8378
let syntaxContextType: EntityContextType | StmtContextType | undefined = void 0;
8479
switch (ruleType) {

‎src/parser/postgresql/index.ts‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,18 +72,13 @@ export class PostgreSQL extends BasicSQL<PostgreSqlLexer, ProgramContext, Postgr
7272
protected processCandidates(
7373
candidates: CandidatesCollection,
7474
allTokens: Token[],
75-
caretTokenIndex: number,
76-
tokenIndexOffset: number
75+
caretTokenIndex: number
7776
): Suggestions<Token> {
7877
const originalSyntaxSuggestions: SyntaxSuggestion<Token>[] = [];
7978
const keywords: string[] = [];
8079
for (let candidate of candidates.rules) {
8180
const [ruleType, candidateRule] = candidate;
82-
const startTokenIndex = candidateRule.startTokenIndex + tokenIndexOffset;
83-
const tokenRanges = allTokens.slice(
84-
startTokenIndex,
85-
caretTokenIndex + tokenIndexOffset + 1
86-
);
81+
const tokenRanges = allTokens.slice(candidateRule.startTokenIndex, caretTokenIndex + 1);
8782

8883
let syntaxContextType: EntityContextType | StmtContextType | undefined = void 0;
8984
switch (ruleType) {

‎src/parser/spark/index.ts‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,19 +67,14 @@ export class SparkSQL extends BasicSQL<SparkSqlLexer, ProgramContext, SparkSqlPa
6767
protected processCandidates(
6868
candidates: CandidatesCollection,
6969
allTokens: Token[],
70-
caretTokenIndex: number,
71-
tokenIndexOffset: number
70+
caretTokenIndex: number
7271
): Suggestions<Token> {
7372
const originalSyntaxSuggestions: SyntaxSuggestion<Token>[] = [];
7473
const keywords: string[] = [];
7574

7675
for (const candidate of candidates.rules) {
7776
const [ruleType, candidateRule] = candidate;
78-
const startTokenIndex = candidateRule.startTokenIndex + tokenIndexOffset;
79-
const tokenRanges = allTokens.slice(
80-
startTokenIndex,
81-
caretTokenIndex + tokenIndexOffset + 1
82-
);
77+
const tokenRanges = allTokens.slice(candidateRule.startTokenIndex, caretTokenIndex + 1);
8378

8479
let syntaxContextType: EntityContextType | StmtContextType | undefined = void 0;
8580
switch (ruleType) {

‎src/parser/trino/index.ts‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,19 +69,14 @@ export class TrinoSQL extends BasicSQL<TrinoSqlLexer, ProgramContext, TrinoSqlPa
6969
protected processCandidates(
7070
candidates: CandidatesCollection,
7171
allTokens: Token[],
72-
caretTokenIndex: number,
73-
tokenIndexOffset: number
72+
caretTokenIndex: number
7473
): Suggestions<Token> {
7574
const originalSyntaxSuggestions: SyntaxSuggestion<Token>[] = [];
7675
const keywords: string[] = [];
7776

7877
for (let candidate of candidates.rules) {
7978
const [ruleType, candidateRule] = candidate;
80-
const startTokenIndex = candidateRule.startTokenIndex + tokenIndexOffset;
81-
const tokenRanges = allTokens.slice(
82-
startTokenIndex,
83-
caretTokenIndex + tokenIndexOffset + 1
84-
);
79+
const tokenRanges = allTokens.slice(candidateRule.startTokenIndex, caretTokenIndex + 1);
8580

8681
let syntaxContextType: EntityContextType | StmtContextType | undefined = void 0;
8782
switch (ruleType) {

‎test/parser/flink/suggestion/multipleStatement.test.ts‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,25 @@ describe('FlinkSQL Multiple Statements Syntax Suggestion', () => {
3636
);
3737

3838
expect(suggestion).not.toBeUndefined();
39-
expect(suggestion?.wordRanges.map((token) => token.text)).toEqual(['db', '.']);
39+
expect(suggestion?.wordRanges?.length).toBe(2);
40+
expect(suggestion?.wordRanges).toEqual([
41+
{
42+
text: 'db',
43+
line: 16,
44+
startIndex: 306,
45+
endIndex: 307,
46+
startColumn: 14,
47+
endColumn: 16,
48+
},
49+
{
50+
text: '.',
51+
line: 16,
52+
startIndex: 308,
53+
endIndex: 308,
54+
startColumn: 16,
55+
endColumn: 17,
56+
},
57+
]);
4058
});
4159

4260
test('Insert into table ', () => {

‎test/parser/flink/suggestion/syntaxSuggestion.test.ts‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,17 @@ describe('Flink SQL Syntax Suggestion', () => {
3232
);
3333

3434
expect(suggestion).not.toBeUndefined();
35-
expect(suggestion?.wordRanges.map((token) => token.text)).toEqual(['cat']);
35+
expect(suggestion?.wordRanges?.length).toBe(1);
36+
expect(suggestion?.wordRanges).toEqual([
37+
{
38+
text: 'cat',
39+
line: 1,
40+
startIndex: 13,
41+
endIndex: 15,
42+
startColumn: 14,
43+
endColumn: 17,
44+
},
45+
]);
3646
});
3747

3848
test('Select table', () => {

0 commit comments

Comments
 (0)