Skip to content

Commit 2fe9ab9

Browse files
asvishnyakovasvishnyakov
committed
fix: issues
antlr4 has some issues with typescript typings, which should be fixed in 4.12.1: antlr/antlr4#4147 antlr/antlr4#4149
1 parent f7ed657 commit 2fe9ab9

File tree

3 files changed

+29
-31
lines changed

3 files changed

+29
-31
lines changed

‎client-app/core/utilities/search/search-phrase/generated/SearchPhraseLexer.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ export default class SearchPhraseLexer extends Lexer {
2323
public static readonly EOF = Token.EOF;
2424

2525
public static readonly channelNames: string[] = [ "DEFAULT_TOKEN_CHANNEL", "HIDDEN" ];
26-
public static readonly literalNames: string[] = [ null, "'!'", "':'", "','" ];
27-
public static readonly symbolicNames: string[] = [ null, null, "FD", "VD",
28-
"RD", "RangeStart",
29-
"RangeEnd", "String",
26+
public static readonly literalNames: (string | null)[] = [ null, "'!'", "':'", "','" ];
27+
public static readonly symbolicNames: (string | null)[] = [ null, null, "FD", "VD",
28+
"RD", "RangeStart",
29+
"RangeEnd", "String",
3030
"WS" ];
3131
public static readonly modeNames: string[] = [ "DEFAULT_MODE", ];
3232

3333
public static readonly ruleNames: string[] = [
34-
"T__0", "FD", "VD", "RD", "RangeStart", "RangeEnd", "String", "SimpleString",
34+
"T__0", "FD", "VD", "RD", "RangeStart", "RangeEnd", "String", "SimpleString",
3535
"QuotedString", "Esc", "WS",
3636
];
3737

@@ -87,4 +87,4 @@ export default class SearchPhraseLexer extends Lexer {
8787

8888

8989
static DecisionsToDFA = SearchPhraseLexer._ATN.decisionToState.map( (ds: DecisionState, index: number) => new DFA(ds, index) );
90-
}
90+
}

‎client-app/core/utilities/search/search-phrase/generated/SearchPhraseParser.ts‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,17 @@ export default class SearchPhraseParser extends Parser {
4242
public static readonly RULE_upper = 13;
4343
public static readonly RULE_string = 14;
4444
public static readonly RULE_negation = 15;
45-
public static readonly literalNames: (string | null)[] = [ null, "'!'",
45+
public static readonly literalNames: (string | null)[] = [ null, "'!'",
4646
"':'", "','" ];
47-
public static readonly symbolicNames: (string | null)[] = [ null, null,
48-
"FD", "VD",
49-
"RD", "RangeStart",
50-
"RangeEnd",
47+
public static readonly symbolicNames: (string | null)[] = [ null, null,
48+
"FD", "VD",
49+
"RD", "RangeStart",
50+
"RangeEnd",
5151
"String", "WS" ];
5252
// tslint:disable:no-trailing-whitespace
5353
public static readonly ruleNames: string[] = [
54-
"searchPhrase", "phrase", "keyword", "filters", "attributeFilter", "rangeFilter",
55-
"fieldName", "attributeFilterValue", "rangeFilterValue", "range", "rangeStart",
54+
"searchPhrase", "phrase", "keyword", "filters", "attributeFilter", "rangeFilter",
55+
"fieldName", "attributeFilterValue", "rangeFilterValue", "range", "rangeStart",
5656
"rangeEnd", "lower", "upper", "string", "negation",
5757
];
5858
public get grammarFileName(): string { return "SearchPhrase.g4"; }
@@ -740,7 +740,7 @@ export default class SearchPhraseParser extends Parser {
740740
}
741741

742742
export class SearchPhraseContext extends ParserRuleContext {
743-
constructor(parser?: SearchPhraseParser, parent?: ParserRuleContext, invokingState?: number) {
743+
constructor(parser?: Parser, parent?: ParserRuleContext, invokingState?: number) {
744744
super(parent, invokingState);
745745
this.parser = parser;
746746
}
@@ -773,7 +773,7 @@ export class SearchPhraseContext extends ParserRuleContext {
773773

774774

775775
export class PhraseContext extends ParserRuleContext {
776-
constructor(parser?: SearchPhraseParser, parent?: ParserRuleContext, invokingState?: number) {
776+
constructor(parser?: Parser, parent?: ParserRuleContext, invokingState?: number) {
777777
super(parent, invokingState);
778778
this.parser = parser;
779779
}
@@ -800,7 +800,7 @@ export class PhraseContext extends ParserRuleContext {
800800

801801

802802
export class KeywordContext extends ParserRuleContext {
803-
constructor(parser?: SearchPhraseParser, parent?: ParserRuleContext, invokingState?: number) {
803+
constructor(parser?: Parser, parent?: ParserRuleContext, invokingState?: number) {
804804
super(parent, invokingState);
805805
this.parser = parser;
806806
}
@@ -824,7 +824,7 @@ export class KeywordContext extends ParserRuleContext {
824824

825825

826826
export class FiltersContext extends ParserRuleContext {
827-
constructor(parser?: SearchPhraseParser, parent?: ParserRuleContext, invokingState?: number) {
827+
constructor(parser?: Parser, parent?: ParserRuleContext, invokingState?: number) {
828828
super(parent, invokingState);
829829
this.parser = parser;
830830
}
@@ -854,7 +854,7 @@ export class FiltersContext extends ParserRuleContext {
854854

855855

856856
export class AttributeFilterContext extends ParserRuleContext {
857-
constructor(parser?: SearchPhraseParser, parent?: ParserRuleContext, invokingState?: number) {
857+
constructor(parser?: Parser, parent?: ParserRuleContext, invokingState?: number) {
858858
super(parent, invokingState);
859859
this.parser = parser;
860860
}
@@ -884,7 +884,7 @@ export class AttributeFilterContext extends ParserRuleContext {
884884

885885

886886
export class RangeFilterContext extends ParserRuleContext {
887-
constructor(parser?: SearchPhraseParser, parent?: ParserRuleContext, invokingState?: number) {
887+
constructor(parser?: Parser, parent?: ParserRuleContext, invokingState?: number) {
888888
super(parent, invokingState);
889889
this.parser = parser;
890890
}
@@ -914,7 +914,7 @@ export class RangeFilterContext extends ParserRuleContext {
914914

915915

916916
export class FieldNameContext extends ParserRuleContext {
917-
constructor(parser?: SearchPhraseParser, parent?: ParserRuleContext, invokingState?: number) {
917+
constructor(parser?: Parser, parent?: ParserRuleContext, invokingState?: number) {
918918
super(parent, invokingState);
919919
this.parser = parser;
920920
}
@@ -938,7 +938,7 @@ export class FieldNameContext extends ParserRuleContext {
938938

939939

940940
export class AttributeFilterValueContext extends ParserRuleContext {
941-
constructor(parser?: SearchPhraseParser, parent?: ParserRuleContext, invokingState?: number) {
941+
constructor(parser?: Parser, parent?: ParserRuleContext, invokingState?: number) {
942942
super(parent, invokingState);
943943
this.parser = parser;
944944
}
@@ -971,7 +971,7 @@ export class AttributeFilterValueContext extends ParserRuleContext {
971971

972972

973973
export class RangeFilterValueContext extends ParserRuleContext {
974-
constructor(parser?: SearchPhraseParser, parent?: ParserRuleContext, invokingState?: number) {
974+
constructor(parser?: Parser, parent?: ParserRuleContext, invokingState?: number) {
975975
super(parent, invokingState);
976976
this.parser = parser;
977977
}
@@ -1004,7 +1004,7 @@ export class RangeFilterValueContext extends ParserRuleContext {
10041004

10051005

10061006
export class RangeContext extends ParserRuleContext {
1007-
constructor(parser?: SearchPhraseParser, parent?: ParserRuleContext, invokingState?: number) {
1007+
constructor(parser?: Parser, parent?: ParserRuleContext, invokingState?: number) {
10081008
super(parent, invokingState);
10091009
this.parser = parser;
10101010
}
@@ -1046,7 +1046,7 @@ export class RangeContext extends ParserRuleContext {
10461046

10471047

10481048
export class RangeStartContext extends ParserRuleContext {
1049-
constructor(parser?: SearchPhraseParser, parent?: ParserRuleContext, invokingState?: number) {
1049+
constructor(parser?: Parser, parent?: ParserRuleContext, invokingState?: number) {
10501050
super(parent, invokingState);
10511051
this.parser = parser;
10521052
}
@@ -1070,7 +1070,7 @@ export class RangeStartContext extends ParserRuleContext {
10701070

10711071

10721072
export class RangeEndContext extends ParserRuleContext {
1073-
constructor(parser?: SearchPhraseParser, parent?: ParserRuleContext, invokingState?: number) {
1073+
constructor(parser?: Parser, parent?: ParserRuleContext, invokingState?: number) {
10741074
super(parent, invokingState);
10751075
this.parser = parser;
10761076
}
@@ -1094,7 +1094,7 @@ export class RangeEndContext extends ParserRuleContext {
10941094

10951095

10961096
export class LowerContext extends ParserRuleContext {
1097-
constructor(parser?: SearchPhraseParser, parent?: ParserRuleContext, invokingState?: number) {
1097+
constructor(parser?: Parser, parent?: ParserRuleContext, invokingState?: number) {
10981098
super(parent, invokingState);
10991099
this.parser = parser;
11001100
}
@@ -1118,7 +1118,7 @@ export class LowerContext extends ParserRuleContext {
11181118

11191119

11201120
export class UpperContext extends ParserRuleContext {
1121-
constructor(parser?: SearchPhraseParser, parent?: ParserRuleContext, invokingState?: number) {
1121+
constructor(parser?: Parser, parent?: ParserRuleContext, invokingState?: number) {
11221122
super(parent, invokingState);
11231123
this.parser = parser;
11241124
}
@@ -1142,7 +1142,7 @@ export class UpperContext extends ParserRuleContext {
11421142

11431143

11441144
export class StringContext extends ParserRuleContext {
1145-
constructor(parser?: SearchPhraseParser, parent?: ParserRuleContext, invokingState?: number) {
1145+
constructor(parser?: Parser, parent?: ParserRuleContext, invokingState?: number) {
11461146
super(parent, invokingState);
11471147
this.parser = parser;
11481148
}
@@ -1166,7 +1166,7 @@ export class StringContext extends ParserRuleContext {
11661166

11671167

11681168
export class NegationContext extends ParserRuleContext {
1169-
constructor(parser?: SearchPhraseParser, parent?: ParserRuleContext, invokingState?: number) {
1169+
constructor(parser?: Parser, parent?: ParserRuleContext, invokingState?: number) {
11701170
super(parent, invokingState);
11711171
this.parser = parser;
11721172
}

‎client-app/core/utilities/search/search-phrase/generated/index.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
export * from "./SearchPhraseLexer";
21
export { default as SearchPhraseLexer } from "./SearchPhraseLexer";
3-
export * from "./SearchPhraseListener";
42
export { default as SearchPhraseListenerBase } from "./SearchPhraseListener";
53
export * from "./SearchPhraseParser";
64
export { default as SearchPhraseParserBase } from "./SearchPhraseParser";

0 commit comments

Comments
 (0)