@artel/artc 0.6.25233 → 0.6.25234
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/Cli.js +3 -3
- package/build/api/Api.js +8 -2
- package/build/api/ApiNodeJS.js +3 -3
- package/build/api/ApiServices.js +142 -142
- package/build/{chunk-SCSDVK4I.js → chunk-C2RH46GK.js} +1 -1
- package/build/{chunk-YA4OCEDT.js → chunk-ENNXNHHT.js} +2 -2
- package/build/{chunk-T4JAN46C.js → chunk-YAYSHO33.js} +1167 -601
- package/build/types/analysis/Analyzer.d.ts +12 -3
- package/build/types/analysis/BaseMemberConflictsValidator.d.ts +28 -0
- package/build/types/analysis/LocalizationContext.d.ts +3 -2
- package/build/types/analysis/ModifierValidator.d.ts +1 -4
- package/build/types/common/ArrayUtils.d.ts +1 -1
- package/build/types/common/Query.d.ts +1 -0
- package/build/types/diagnostic/DiagnosticCode.d.ts +2 -0
- package/build/types/diagnostic/TokenDiagnostic.d.ts +2 -0
- package/build/types/entities/TypeEntity.d.ts +3 -0
- package/build/types/parser/TokenKind.d.ts +55 -55
- package/build/types/tree/TokenKind.d.ts +54 -54
- package/build/types/types/TypeMembers.d.ts +15 -0
- package/package.json +1 -1
package/build/api/ApiServices.js
CHANGED
@@ -182,7 +182,7 @@ import {
|
|
182
182
|
unwrapParenthesizedExpressions,
|
183
183
|
visitChildren,
|
184
184
|
yieldExecution
|
185
|
-
} from "../chunk-
|
185
|
+
} from "../chunk-YAYSHO33.js";
|
186
186
|
|
187
187
|
// source/services/CustomCommand.ts
|
188
188
|
import * as ls from "vscode-languageserver";
|
@@ -410,7 +410,7 @@ var SyntaxFactory = class {
|
|
410
410
|
let equalsToken;
|
411
411
|
if (alias !== void 0) {
|
412
412
|
aliasIdentifier = this.createIdentifier(alias);
|
413
|
-
equalsToken = this.token(
|
413
|
+
equalsToken = this.token(58 /* Equals */);
|
414
414
|
}
|
415
415
|
const packageName = this.packageName(pathSegments);
|
416
416
|
const packageImport = new PackageImport(aliasIdentifier, equalsToken, packageName);
|
@@ -419,7 +419,7 @@ var SyntaxFactory = class {
|
|
419
419
|
}
|
420
420
|
static packageName(segments) {
|
421
421
|
const segmentIdentifiers = segments.map((s) => this.createIdentifier(s));
|
422
|
-
const packageNameParts = this.createTokenSeparatedElements(segmentIdentifiers,
|
422
|
+
const packageNameParts = this.createTokenSeparatedElements(segmentIdentifiers, 27 /* Dot */);
|
423
423
|
return new PackageName(packageNameParts);
|
424
424
|
}
|
425
425
|
static packageAliasTypeDeclaration(tags, modifiers, name, typeParameters, body) {
|
@@ -428,7 +428,7 @@ var SyntaxFactory = class {
|
|
428
428
|
const typeKeyword = this.keyword(16 /* Type */);
|
429
429
|
const nameIdentifier = this.createIdentifier(name);
|
430
430
|
const typeParameterClause = this.createTypeParameterClause(typeParameters);
|
431
|
-
const equalsToken = this.token(
|
431
|
+
const equalsToken = this.token(58 /* Equals */);
|
432
432
|
return new PackageAliasTypeDeclaration(
|
433
433
|
tagList,
|
434
434
|
modifierList,
|
@@ -450,9 +450,9 @@ var SyntaxFactory = class {
|
|
450
450
|
return new PackageMemberGroupDeclaration(
|
451
451
|
tagList,
|
452
452
|
modifierList,
|
453
|
-
this.token(
|
453
|
+
this.token(44 /* OpenBrace */),
|
454
454
|
declarationList,
|
455
|
-
this.token(
|
455
|
+
this.token(21 /* CloseBrace */)
|
456
456
|
);
|
457
457
|
}
|
458
458
|
static packageFunctionDeclaration(tags, modifiers, name, typeParameters, parameters, returnTypeSpecifier, body) {
|
@@ -480,7 +480,7 @@ var SyntaxFactory = class {
|
|
480
480
|
const typeKeyword = this.keyword(16 /* Type */);
|
481
481
|
const nameIdentifier = this.createIdentifier(name);
|
482
482
|
const typeParameterClause = this.createTypeParameterClause(typeParameters);
|
483
|
-
const equalsToken = this.token(
|
483
|
+
const equalsToken = this.token(58 /* Equals */);
|
484
484
|
return new PackageFunctionTypeDeclaration(
|
485
485
|
tagList,
|
486
486
|
modifierList,
|
@@ -503,7 +503,7 @@ var SyntaxFactory = class {
|
|
503
503
|
const typeKeyword = this.keyword(16 /* Type */);
|
504
504
|
const nameIdentifier = this.createIdentifier(name);
|
505
505
|
const typeParameterClause = this.createTypeParameterClause(typeParameters);
|
506
|
-
const equalsToken = this.token(
|
506
|
+
const equalsToken = this.token(58 /* Equals */);
|
507
507
|
return new PackageStructuredTypeDeclaration(
|
508
508
|
tagList,
|
509
509
|
modifierList,
|
@@ -516,7 +516,7 @@ var SyntaxFactory = class {
|
|
516
516
|
}
|
517
517
|
static structuredTypeDeclarationBody(structuredTypeKind, baseTypes, members) {
|
518
518
|
const structuredTypeKindKeyword = this.keyword(structuredTypeKind);
|
519
|
-
const baseTypeList = baseTypes !== void 0 ? new BaseTypeList(this.createTokenSeparatedElements(baseTypes,
|
519
|
+
const baseTypeList = baseTypes !== void 0 ? new BaseTypeList(this.createTokenSeparatedElements(baseTypes, 25 /* Comma */)) : void 0;
|
520
520
|
const memberBlock = this.typeMemberDeclarationBlock(members);
|
521
521
|
return new StructuredTypeDeclarationBody(
|
522
522
|
structuredTypeKindKeyword,
|
@@ -531,7 +531,7 @@ var SyntaxFactory = class {
|
|
531
531
|
const typeAnnotation = this.createTypeAnnotation(typeSpecifier);
|
532
532
|
let equalsToken;
|
533
533
|
if (initializer !== void 0) {
|
534
|
-
equalsToken = this.token(
|
534
|
+
equalsToken = this.token(58 /* Equals */);
|
535
535
|
}
|
536
536
|
return new PackageVariableDeclaration(
|
537
537
|
tagList,
|
@@ -570,7 +570,7 @@ var SyntaxFactory = class {
|
|
570
570
|
const typeKeyword = this.keyword(16 /* Type */);
|
571
571
|
const nameIdentifier = this.createIdentifier(name);
|
572
572
|
const typeParameterClause = this.createTypeParameterClause(typeParameters);
|
573
|
-
const equalsToken = this.token(
|
573
|
+
const equalsToken = this.token(58 /* Equals */);
|
574
574
|
return new PackageVariantTypeDeclaration(
|
575
575
|
tagList,
|
576
576
|
modifierList,
|
@@ -593,7 +593,7 @@ var SyntaxFactory = class {
|
|
593
593
|
const typeAnnotation = this.createTypeAnnotation(typeSpecifier);
|
594
594
|
let equalsToken;
|
595
595
|
if (initializer !== void 0) {
|
596
|
-
equalsToken = this.token(
|
596
|
+
equalsToken = this.token(58 /* Equals */);
|
597
597
|
}
|
598
598
|
return new FieldDeclaration(
|
599
599
|
tagList,
|
@@ -689,9 +689,9 @@ var SyntaxFactory = class {
|
|
689
689
|
}
|
690
690
|
static typeMemberDeclarationBlock(members) {
|
691
691
|
return new TypeMemberDeclarationBlock(
|
692
|
-
this.token(
|
692
|
+
this.token(44 /* OpenBrace */),
|
693
693
|
new TypeMemberDeclarationList(members),
|
694
|
-
this.token(
|
694
|
+
this.token(21 /* CloseBrace */)
|
695
695
|
);
|
696
696
|
}
|
697
697
|
static variantDeclaration(tags, modifiers, name, value) {
|
@@ -700,28 +700,28 @@ var SyntaxFactory = class {
|
|
700
700
|
const nameIdentifier = this.createIdentifier(name);
|
701
701
|
let equalsToken;
|
702
702
|
if (value !== void 0) {
|
703
|
-
equalsToken = this.token(
|
703
|
+
equalsToken = this.token(58 /* Equals */);
|
704
704
|
}
|
705
705
|
return new VariantDeclaration(tagList, modifierList, nameIdentifier, equalsToken, value);
|
706
706
|
}
|
707
707
|
static parameterClause(parameters) {
|
708
708
|
return new ParameterClause(
|
709
|
-
this.token(
|
710
|
-
new ParameterList(this.createTokenSeparatedElements(parameters,
|
711
|
-
this.token(
|
709
|
+
this.token(45 /* OpenParenthesis */),
|
710
|
+
new ParameterList(this.createTokenSeparatedElements(parameters, 25 /* Comma */)),
|
711
|
+
this.token(22 /* CloseParenthesis */)
|
712
712
|
);
|
713
713
|
}
|
714
714
|
static indexParameterClause(indexParameters) {
|
715
715
|
return new IndexParameterClause(
|
716
|
-
this.token(
|
717
|
-
new ParameterList(this.createTokenSeparatedElements(indexParameters,
|
718
|
-
this.token(
|
716
|
+
this.token(46 /* OpenSquareBracket */),
|
717
|
+
new ParameterList(this.createTokenSeparatedElements(indexParameters, 25 /* Comma */)),
|
718
|
+
this.token(23 /* CloseSquareBracket */)
|
719
719
|
);
|
720
720
|
}
|
721
721
|
static namedTypeSpecifier(name, typeArguments) {
|
722
722
|
const qualifiedNameIdentifiers = typeof name === "string" ? [this.createIdentifier(name)] : name.map((s) => this.createIdentifier(s));
|
723
723
|
const qualifiedName = new QualifiedName(
|
724
|
-
this.createTokenSeparatedElements(qualifiedNameIdentifiers,
|
724
|
+
this.createTokenSeparatedElements(qualifiedNameIdentifiers, 27 /* Dot */)
|
725
725
|
);
|
726
726
|
let typeArgumentClause;
|
727
727
|
if (typeArguments !== void 0) {
|
@@ -730,21 +730,21 @@ var SyntaxFactory = class {
|
|
730
730
|
return new NamedTypeSpecifier(qualifiedName, typeArgumentClause);
|
731
731
|
}
|
732
732
|
static unionTypeSpecifier(typeSpecifiers) {
|
733
|
-
return new UnionTypeSpecifier(this.createTokenSeparatedElements(typeSpecifiers,
|
733
|
+
return new UnionTypeSpecifier(this.createTokenSeparatedElements(typeSpecifiers, 18 /* Bar */));
|
734
734
|
}
|
735
735
|
static intersectionTypeSpecifier(typeSpecifiers) {
|
736
736
|
return new IntersectionTypeSpecifier(this.createTokenSeparatedElements(
|
737
737
|
typeSpecifiers,
|
738
|
-
|
738
|
+
11 /* Ampersand */
|
739
739
|
));
|
740
740
|
}
|
741
741
|
static nullableTypeSpecifier(typeSpecifier) {
|
742
|
-
const questionToken = this.token(
|
742
|
+
const questionToken = this.token(50 /* Question */);
|
743
743
|
return new NullableTypeSpecifier(typeSpecifier, questionToken);
|
744
744
|
}
|
745
745
|
static parenthesizedTypeSpecifier(typeSpecifier) {
|
746
|
-
const openParenthesisToken = this.token(
|
747
|
-
const closeParenthesisToken = this.token(
|
746
|
+
const openParenthesisToken = this.token(45 /* OpenParenthesis */);
|
747
|
+
const closeParenthesisToken = this.token(22 /* CloseParenthesis */);
|
748
748
|
return new ParenthesizedTypeSpecifier(openParenthesisToken, typeSpecifier, closeParenthesisToken);
|
749
749
|
}
|
750
750
|
static anonymousStructuredTypeSpecifier(body) {
|
@@ -760,11 +760,11 @@ var SyntaxFactory = class {
|
|
760
760
|
const nameIdentifier = this.createIdentifier(name);
|
761
761
|
let colonToken;
|
762
762
|
if (constraint !== void 0) {
|
763
|
-
colonToken = this.token(
|
763
|
+
colonToken = this.token(24 /* Colon */);
|
764
764
|
}
|
765
765
|
let equalsToken;
|
766
766
|
if (defaultType !== void 0) {
|
767
|
-
equalsToken = this.token(
|
767
|
+
equalsToken = this.token(58 /* Equals */);
|
768
768
|
}
|
769
769
|
return new TypeParameterDeclaration(nameIdentifier, colonToken, constraint, equalsToken, defaultType);
|
770
770
|
}
|
@@ -774,26 +774,26 @@ var SyntaxFactory = class {
|
|
774
774
|
const typeAnnotation = this.createTypeAnnotation(typeSpecifier);
|
775
775
|
let equalsToken;
|
776
776
|
if (defaultValue !== void 0) {
|
777
|
-
equalsToken = this.token(
|
777
|
+
equalsToken = this.token(58 /* Equals */);
|
778
778
|
}
|
779
779
|
return new ParameterDeclaration(tagList, nameIdentifier, typeAnnotation, equalsToken, defaultValue);
|
780
780
|
}
|
781
781
|
static tag(name, typeArguments, args) {
|
782
|
-
const hashSignToken = this.token(
|
782
|
+
const hashSignToken = this.token(36 /* HashSign */);
|
783
783
|
const qualifiedNameIdentifiers = typeof name === "string" ? [this.createIdentifier(name)] : name.map((s) => this.createIdentifier(s));
|
784
784
|
const qualifiedName = new QualifiedName(
|
785
|
-
this.createTokenSeparatedElements(qualifiedNameIdentifiers,
|
785
|
+
this.createTokenSeparatedElements(qualifiedNameIdentifiers, 27 /* Dot */)
|
786
786
|
);
|
787
787
|
const typeArgumentClause = typeArguments !== void 0 ? this.typeArgumentClause(typeArguments) : void 0;
|
788
788
|
let openParenthesisToken;
|
789
789
|
let argumentList;
|
790
790
|
let closeParenthesisToken;
|
791
791
|
if (args !== void 0) {
|
792
|
-
openParenthesisToken = this.token(
|
792
|
+
openParenthesisToken = this.token(45 /* OpenParenthesis */);
|
793
793
|
argumentList = new ArgumentList(
|
794
|
-
this.createTokenSeparatedElements(args,
|
794
|
+
this.createTokenSeparatedElements(args, 25 /* Comma */)
|
795
795
|
);
|
796
|
-
closeParenthesisToken = this.token(
|
796
|
+
closeParenthesisToken = this.token(22 /* CloseParenthesis */);
|
797
797
|
}
|
798
798
|
return new Tag(
|
799
799
|
hashSignToken,
|
@@ -810,38 +810,38 @@ var SyntaxFactory = class {
|
|
810
810
|
let levelKeyword;
|
811
811
|
let closeParenthesisToken;
|
812
812
|
if (level !== void 0) {
|
813
|
-
openParenthesisToken = this.token(
|
813
|
+
openParenthesisToken = this.token(45 /* OpenParenthesis */);
|
814
814
|
levelKeyword = this.keyword(level);
|
815
|
-
closeParenthesisToken = this.token(
|
815
|
+
closeParenthesisToken = this.token(22 /* CloseParenthesis */);
|
816
816
|
}
|
817
817
|
return new Modifier(valueKeyword, openParenthesisToken, levelKeyword, closeParenthesisToken);
|
818
818
|
}
|
819
819
|
static typeArgumentClause(typeArguments) {
|
820
|
-
const lessThanToken = this.token(
|
820
|
+
const lessThanToken = this.token(37 /* LessThan */);
|
821
821
|
const typeArgumentList = new TypeArgumentList(
|
822
|
-
this.createTokenSeparatedElements(typeArguments,
|
822
|
+
this.createTokenSeparatedElements(typeArguments, 25 /* Comma */)
|
823
823
|
);
|
824
|
-
const greaterThanToken = this.token(
|
824
|
+
const greaterThanToken = this.token(34 /* GreaterThan */);
|
825
825
|
return new TypeArgumentClause(lessThanToken, typeArgumentList, greaterThanToken);
|
826
826
|
}
|
827
827
|
static typeAnnotation(typeSpecifier) {
|
828
|
-
return new TypeAnnotation(this.token(
|
828
|
+
return new TypeAnnotation(this.token(24 /* Colon */), typeSpecifier);
|
829
829
|
}
|
830
830
|
static statementBlock(statements) {
|
831
|
-
const openBraceToken = this.token(
|
831
|
+
const openBraceToken = this.token(44 /* OpenBrace */);
|
832
832
|
const statementList = new StatementList(statements);
|
833
|
-
const closeBraceToken = this.token(
|
833
|
+
const closeBraceToken = this.token(21 /* CloseBrace */);
|
834
834
|
return new StatementBlock(openBraceToken, statementList, closeBraceToken);
|
835
835
|
}
|
836
836
|
static functionExpressionBlock(expression) {
|
837
|
-
const openBraceToken = this.token(
|
838
|
-
const closeBraceToken = this.token(
|
837
|
+
const openBraceToken = this.token(44 /* OpenBrace */);
|
838
|
+
const closeBraceToken = this.token(21 /* CloseBrace */);
|
839
839
|
return new FunctionBlock(openBraceToken, expression, closeBraceToken);
|
840
840
|
}
|
841
841
|
static functionStatementBlock(statements) {
|
842
|
-
const openBraceToken = this.token(
|
842
|
+
const openBraceToken = this.token(44 /* OpenBrace */);
|
843
843
|
const statementList = new StatementList(statements);
|
844
|
-
const closeBraceToken = this.token(
|
844
|
+
const closeBraceToken = this.token(21 /* CloseBrace */);
|
845
845
|
return new FunctionBlock(openBraceToken, statementList, closeBraceToken);
|
846
846
|
}
|
847
847
|
static noneLiteral() {
|
@@ -854,9 +854,9 @@ var SyntaxFactory = class {
|
|
854
854
|
const tagList = new TagList([]);
|
855
855
|
const modifierList = new ModifierList([]);
|
856
856
|
const translationsKeyword = this.keyword(55 /* Translations */);
|
857
|
-
const openBraceToken = this.token(
|
857
|
+
const openBraceToken = this.token(44 /* OpenBrace */);
|
858
858
|
const translationList = new TopLevelTranslationList(translations);
|
859
|
-
const closeBraceToken = this.token(
|
859
|
+
const closeBraceToken = this.token(21 /* CloseBrace */);
|
860
860
|
return new TranslationsDeclaration(
|
861
861
|
tagList,
|
862
862
|
modifierList,
|
@@ -868,7 +868,7 @@ var SyntaxFactory = class {
|
|
868
868
|
}
|
869
869
|
static packageVariableTranslation(sourceName, translatedName) {
|
870
870
|
const sourceNameIdentifier = this.createIdentifier(sourceName);
|
871
|
-
const minusGreaterThanToken = this.token(
|
871
|
+
const minusGreaterThanToken = this.token(43 /* MinusGreaterThan */);
|
872
872
|
const translatedNameIdentifier = this.createIdentifier(translatedName);
|
873
873
|
return new PackageVariableTranslation(sourceNameIdentifier, minusGreaterThanToken, translatedNameIdentifier);
|
874
874
|
}
|
@@ -877,7 +877,7 @@ var SyntaxFactory = class {
|
|
877
877
|
const sourceNameIdentifier = this.createIdentifier(sourceName);
|
878
878
|
const sourceTypeParameterClause = this.createTranslationTypeParameterClause(sourceTypeParameters);
|
879
879
|
const sourceParameterClause = this.translationParameterClause(sourceParameters);
|
880
|
-
const minusGreaterThanToken = this.token(
|
880
|
+
const minusGreaterThanToken = this.token(43 /* MinusGreaterThan */);
|
881
881
|
const translatedNameIdentifier = this.createIdentifier(translatedName);
|
882
882
|
const translatedTypeParameterClause = this.createTranslationTypeParameterClause(translatedTypeParameters);
|
883
883
|
const translatedParameterClause = this.translationParameterClause(translatedParameters);
|
@@ -896,16 +896,16 @@ var SyntaxFactory = class {
|
|
896
896
|
const typeKeyword = this.keyword(16 /* Type */);
|
897
897
|
const sourceNameIdentifier = this.createIdentifier(sourceName);
|
898
898
|
const sourceTypeParameterClause = this.createTranslationTypeParameterClause(sourceTypeParameters);
|
899
|
-
const minusGreaterThanToken = this.token(
|
899
|
+
const minusGreaterThanToken = this.token(43 /* MinusGreaterThan */);
|
900
900
|
const translatedNameIdentifier = this.createIdentifier(translatedName);
|
901
901
|
const translatedTypeParameterClause = this.createTranslationTypeParameterClause(translatedTypeParameters);
|
902
902
|
let openBraceToken;
|
903
903
|
let memberList;
|
904
904
|
let closeBraceToken;
|
905
905
|
if (members !== void 0) {
|
906
|
-
openBraceToken = this.token(
|
906
|
+
openBraceToken = this.token(44 /* OpenBrace */);
|
907
907
|
memberList = new TypeMemberTranslationList(members);
|
908
|
-
closeBraceToken = this.token(
|
908
|
+
closeBraceToken = this.token(21 /* CloseBrace */);
|
909
909
|
}
|
910
910
|
return new TypeTranslation(
|
911
911
|
typeKeyword,
|
@@ -924,7 +924,7 @@ var SyntaxFactory = class {
|
|
924
924
|
const sourceNameIdentifier = this.createIdentifier(sourceName);
|
925
925
|
const sourceTypeParameterClause = this.createTranslationTypeParameterClause(sourceTypeParameters);
|
926
926
|
const sourceParameterClause = this.translationParameterClause(sourceParameters);
|
927
|
-
const minusGreaterThanToken = this.token(
|
927
|
+
const minusGreaterThanToken = this.token(43 /* MinusGreaterThan */);
|
928
928
|
const translatedNameIdentifier = this.createIdentifier(translatedName);
|
929
929
|
const translatedTypeParameterClause = this.createTranslationTypeParameterClause(translatedTypeParameters);
|
930
930
|
const translatedParameterClause = this.translationParameterClause(translatedParameters);
|
@@ -941,7 +941,7 @@ var SyntaxFactory = class {
|
|
941
941
|
}
|
942
942
|
static fieldOrVariantTranslation(sourceName, translatedName) {
|
943
943
|
const sourceNameIdentifier = this.createIdentifier(sourceName);
|
944
|
-
const minusGreaterThanToken = this.token(
|
944
|
+
const minusGreaterThanToken = this.token(43 /* MinusGreaterThan */);
|
945
945
|
const translatedNameIdentifier = this.createIdentifier(translatedName);
|
946
946
|
return new FieldOrVariantTranslation(
|
947
947
|
sourceNameIdentifier,
|
@@ -954,7 +954,7 @@ var SyntaxFactory = class {
|
|
954
954
|
const sourceNameIdentifier = this.createIdentifier(sourceName);
|
955
955
|
const sourceTypeParameterClause = this.createTranslationTypeParameterClause(sourceTypeParameters);
|
956
956
|
const sourceParameterClause = this.translationParameterClause(sourceParameters);
|
957
|
-
const minusGreaterThanToken = this.token(
|
957
|
+
const minusGreaterThanToken = this.token(43 /* MinusGreaterThan */);
|
958
958
|
const translatedNameIdentifier = this.createIdentifier(translatedName);
|
959
959
|
const translatedTypeParameterClause = this.createTranslationTypeParameterClause(translatedTypeParameters);
|
960
960
|
const translatedParameterClause = this.translationParameterClause(translatedParameters);
|
@@ -972,7 +972,7 @@ var SyntaxFactory = class {
|
|
972
972
|
static constructorTranslation(sourceParameters, translatedParameters) {
|
973
973
|
const creationKeyword = this.keyword(31 /* Creation */);
|
974
974
|
const sourceParameterClause = this.translationParameterClause(sourceParameters);
|
975
|
-
const minusGreaterThanToken = this.token(
|
975
|
+
const minusGreaterThanToken = this.token(43 /* MinusGreaterThan */);
|
976
976
|
const translatedParameterClause = this.translationParameterClause(translatedParameters);
|
977
977
|
return new ConstructorTranslation(
|
978
978
|
creationKeyword,
|
@@ -983,24 +983,24 @@ var SyntaxFactory = class {
|
|
983
983
|
}
|
984
984
|
static indexerTranslation(sourceParameters, translatedParameters) {
|
985
985
|
const sourceParameterClause = this.indexParameterTranslationClause(sourceParameters);
|
986
|
-
const minusGreaterThanToken = this.token(
|
986
|
+
const minusGreaterThanToken = this.token(43 /* MinusGreaterThan */);
|
987
987
|
const translatedParameterClause = this.indexParameterTranslationClause(translatedParameters);
|
988
988
|
return new IndexerTranslation(sourceParameterClause, minusGreaterThanToken, translatedParameterClause);
|
989
989
|
}
|
990
990
|
static translationParameterClause(parameters) {
|
991
|
-
const openParenthesisToken = this.token(
|
991
|
+
const openParenthesisToken = this.token(45 /* OpenParenthesis */);
|
992
992
|
const parameterList = new TranslationParameterList(
|
993
|
-
this.createTokenSeparatedElements(parameters.map((p) => this.createIdentifier(p)),
|
993
|
+
this.createTokenSeparatedElements(parameters.map((p) => this.createIdentifier(p)), 25 /* Comma */)
|
994
994
|
);
|
995
|
-
const closeParenthesisToken = this.token(
|
995
|
+
const closeParenthesisToken = this.token(22 /* CloseParenthesis */);
|
996
996
|
return new TranslationParameterClause(openParenthesisToken, parameterList, closeParenthesisToken);
|
997
997
|
}
|
998
998
|
static indexParameterTranslationClause(parameters) {
|
999
|
-
const openSquareBracketToken = this.token(
|
999
|
+
const openSquareBracketToken = this.token(46 /* OpenSquareBracket */);
|
1000
1000
|
const parameterList = new TranslationParameterList(
|
1001
|
-
this.createTokenSeparatedElements(parameters.map((p) => this.createIdentifier(p)),
|
1001
|
+
this.createTokenSeparatedElements(parameters.map((p) => this.createIdentifier(p)), 25 /* Comma */)
|
1002
1002
|
);
|
1003
|
-
const closeSquareBracketToken = this.token(
|
1003
|
+
const closeSquareBracketToken = this.token(23 /* CloseSquareBracket */);
|
1004
1004
|
return new IndexParameterTranslationClause(openSquareBracketToken, parameterList, closeSquareBracketToken);
|
1005
1005
|
}
|
1006
1006
|
static token(kind, value) {
|
@@ -1015,9 +1015,9 @@ var SyntaxFactory = class {
|
|
1015
1015
|
return void 0;
|
1016
1016
|
}
|
1017
1017
|
return new TypeParameterClause(
|
1018
|
-
this.token(
|
1019
|
-
new TypeParameterList(this.createTokenSeparatedElements(typeParameters,
|
1020
|
-
this.token(
|
1018
|
+
this.token(37 /* LessThan */),
|
1019
|
+
new TypeParameterList(this.createTokenSeparatedElements(typeParameters, 25 /* Comma */)),
|
1020
|
+
this.token(34 /* GreaterThan */)
|
1021
1021
|
);
|
1022
1022
|
}
|
1023
1023
|
static createTranslationTypeParameterClause(typeParameters) {
|
@@ -1025,22 +1025,22 @@ var SyntaxFactory = class {
|
|
1025
1025
|
return void 0;
|
1026
1026
|
}
|
1027
1027
|
return new TranslationTypeParameterClause(
|
1028
|
-
this.token(
|
1028
|
+
this.token(37 /* LessThan */),
|
1029
1029
|
new TranslationTypeParameterList(
|
1030
|
-
this.createTokenSeparatedElements(typeParameters.map((p) => this.createIdentifier(p)),
|
1030
|
+
this.createTokenSeparatedElements(typeParameters.map((p) => this.createIdentifier(p)), 25 /* Comma */)
|
1031
1031
|
),
|
1032
|
-
this.token(
|
1032
|
+
this.token(34 /* GreaterThan */)
|
1033
1033
|
);
|
1034
1034
|
}
|
1035
1035
|
static createTypeAnnotation(typeSpecifier) {
|
1036
1036
|
if (typeSpecifier === void 0) {
|
1037
1037
|
return void 0;
|
1038
1038
|
}
|
1039
|
-
return new TypeAnnotation(this.token(
|
1039
|
+
return new TypeAnnotation(this.token(24 /* Colon */), typeSpecifier);
|
1040
1040
|
}
|
1041
1041
|
static createIdentifier(value) {
|
1042
1042
|
if (typeof value === "string") {
|
1043
|
-
return new Token(
|
1043
|
+
return new Token(10 /* Identifier */, value, [], 0 /* None */, void 0);
|
1044
1044
|
}
|
1045
1045
|
return value;
|
1046
1046
|
}
|
@@ -1897,7 +1897,7 @@ var SyntaxToCode = class _SyntaxToCode {
|
|
1897
1897
|
let isPreviousElementSemicolon = false;
|
1898
1898
|
for (let i = 0; i < elements.length; i++) {
|
1899
1899
|
const element = elements[i];
|
1900
|
-
if (element.kind === 0 /* Token */ && element.tokenKind ===
|
1900
|
+
if (element.kind === 0 /* Token */ && element.tokenKind === 52 /* Semicolon */) {
|
1901
1901
|
this.writeToken(element);
|
1902
1902
|
isPreviousElementSemicolon = true;
|
1903
1903
|
} else {
|
@@ -1915,7 +1915,7 @@ var SyntaxToCode = class _SyntaxToCode {
|
|
1915
1915
|
writeCommaSeparatedList(elements, writeNonCommaElement) {
|
1916
1916
|
for (let i = 0; i < elements.length; i++) {
|
1917
1917
|
const element = elements[i];
|
1918
|
-
if (element.kind === 0 /* Token */ && element.tokenKind ===
|
1918
|
+
if (element.kind === 0 /* Token */ && element.tokenKind === 25 /* Comma */) {
|
1919
1919
|
this.writeToken(element);
|
1920
1920
|
} else {
|
1921
1921
|
if (i > 0) {
|
@@ -1946,7 +1946,7 @@ var SyntaxToCode = class _SyntaxToCode {
|
|
1946
1946
|
this.writeCode(tokenKindValues[token.tokenKind]);
|
1947
1947
|
} else {
|
1948
1948
|
let value = token.value;
|
1949
|
-
if (token.tokenKind ===
|
1949
|
+
if (token.tokenKind === 10 /* Identifier */) {
|
1950
1950
|
if (!Scanner.isIdentifier(value) || this._singleWordKeywordValues.has(value)) {
|
1951
1951
|
value = `'${this.escapeLiteralIdentifier(value)}'`;
|
1952
1952
|
}
|
@@ -2299,7 +2299,7 @@ var TokenOrKeywordsTouchingOffset_two = class {
|
|
2299
2299
|
this.kind = "two";
|
2300
2300
|
}
|
2301
2301
|
getSinglePrioritizingNamed() {
|
2302
|
-
if (this.left.isToken(
|
2302
|
+
if (this.left.isToken(10 /* Identifier */) || this.left.isKeyword()) {
|
2303
2303
|
return this.left;
|
2304
2304
|
}
|
2305
2305
|
return this.right;
|
@@ -2336,7 +2336,7 @@ var TranslationsGenerationService = class {
|
|
2336
2336
|
return void 0;
|
2337
2337
|
}
|
2338
2338
|
let result;
|
2339
|
-
if (tokenOrKeyword.isToken(
|
2339
|
+
if (tokenOrKeyword.isToken(10 /* Identifier */) && tokenOrKeyword.parent.kind === 139 /* TypeTranslation */ && tokenOrKeyword.value === tokenOrKeyword.parent.sourceName) {
|
2340
2340
|
const translationPackage = analyzer.getAnalyzedTranslationPackageIfTargetResolved(sourceFile.package);
|
2341
2341
|
if (translationPackage !== void 0) {
|
2342
2342
|
const generator = new TranslationsGenerator(
|
@@ -3131,8 +3131,8 @@ var CompletionService = class {
|
|
3131
3131
|
this._sourceFile = sourceFile;
|
3132
3132
|
this._analyzer = analyzer;
|
3133
3133
|
this._completionItemInfoContext.clear();
|
3134
|
-
this._locale =
|
3135
|
-
this._dialect = sourceFile.package.dialect
|
3134
|
+
this._locale = sourceFile.package.locale;
|
3135
|
+
this._dialect = sourceFile.package.dialect;
|
3136
3136
|
const positionDescription = this.createPositionDescription(sourceFile.getSyntaxNode(), offset);
|
3137
3137
|
const semanticContext = this.createSemanticContextAtPosition(positionDescription);
|
3138
3138
|
const syntaxContext = SyntaxContextFactory.fromPositionDescription(sourceFile, positionDescription);
|
@@ -3180,7 +3180,7 @@ var CompletionService = class {
|
|
3180
3180
|
}
|
3181
3181
|
createPositionDescription(sourceFile, offset) {
|
3182
3182
|
let token = getPrecedingToken(sourceFile, offset);
|
3183
|
-
if (token?.tokenKind ===
|
3183
|
+
if (token?.tokenKind === 10 /* Identifier */ && offset === token.rangeWithoutTrivia.end) {
|
3184
3184
|
token = getPrecedingToken(sourceFile, offset - 1);
|
3185
3185
|
}
|
3186
3186
|
let result;
|
@@ -3214,18 +3214,18 @@ var CompletionService = class {
|
|
3214
3214
|
if (tokenOrKeyword.isKeyword(18 /* Import */) && tokenOrKeyword.parent.kind === 5 /* SinglePackageImportDirective */) {
|
3215
3215
|
return new PackageImportCompletionContext([], void 0);
|
3216
3216
|
}
|
3217
|
-
if (tokenOrKeyword.isToken(
|
3217
|
+
if (tokenOrKeyword.isToken(58 /* Equals */) && tokenOrKeyword.parent.kind === 8 /* PackageImport */) {
|
3218
3218
|
return new PackageImportCompletionContext([], void 0);
|
3219
3219
|
}
|
3220
|
-
if (tokenOrKeyword.isToken(
|
3220
|
+
if (tokenOrKeyword.isToken(27 /* Dot */) && tokenOrKeyword.parent.kind === 9 /* PackageName */) {
|
3221
3221
|
const packageImport = tokenOrKeyword.parent.parent;
|
3222
3222
|
const precedingSegmentNames = packageImport.packageName.segments.takeWhile((s) => s.rangeStart < tokenOrKeyword.value.rangeStart).map((p) => this._analyzer.createNameFromIdentifier(p)).toArray();
|
3223
3223
|
return new PackageImportCompletionContext(precedingSegmentNames, void 0);
|
3224
3224
|
}
|
3225
|
-
if (tokenOrKeyword.isToken(
|
3225
|
+
if (tokenOrKeyword.isToken(44 /* OpenBrace */) && tokenOrKeyword.parent.kind === 6 /* PackageGroupImportDirective */ || this.tokenOrKeywordIsPackageImportListChild(tokenOrKeyword)) {
|
3226
3226
|
return new PackageImportCompletionContext([], void 0);
|
3227
3227
|
}
|
3228
|
-
if (tokenOrKeyword.isToken(
|
3228
|
+
if (tokenOrKeyword.isToken(27 /* Dot */) && tokenOrKeyword.parent.kind === 78 /* MemberAccessExpression */) {
|
3229
3229
|
const memberAccess = tokenOrKeyword.parent;
|
3230
3230
|
{
|
3231
3231
|
const info = this._analyzer.checkExpressionDenotesPackageNameSegment(memberAccess.expression);
|
@@ -3265,7 +3265,7 @@ var CompletionService = class {
|
|
3265
3265
|
semanticContext
|
3266
3266
|
);
|
3267
3267
|
}
|
3268
|
-
if (tokenOrKeyword.isToken(
|
3268
|
+
if (tokenOrKeyword.isToken(27 /* Dot */) && tokenOrKeyword.parent.kind === 135 /* QualifiedName */ && tokenOrKeyword.parent.parent.kind === 10 /* NamedTypeSpecifier */) {
|
3269
3269
|
const namedTypeSpecifier = tokenOrKeyword.parent.parent;
|
3270
3270
|
const resolutionResult = this._analyzer.resolveNamedTypeSpecifier(namedTypeSpecifier);
|
3271
3271
|
const segmentIndex = Math.floor(
|
@@ -3307,7 +3307,7 @@ var CompletionService = class {
|
|
3307
3307
|
}
|
3308
3308
|
return { kind: "none" };
|
3309
3309
|
}
|
3310
|
-
if (tokenOrKeyword.isToken(
|
3310
|
+
if (tokenOrKeyword.isToken(27 /* Dot */) && tokenOrKeyword.parent.kind === 135 /* QualifiedName */ && tokenOrKeyword.parent.parent.kind === 147 /* Tag */) {
|
3311
3311
|
const tag = tokenOrKeyword.parent.parent;
|
3312
3312
|
const resolutionResult = this._analyzer.resolveTag(tag);
|
3313
3313
|
const segmentIndex = Math.floor(
|
@@ -3432,7 +3432,7 @@ var CompletionService = class {
|
|
3432
3432
|
hasPrecedingKeyword
|
3433
3433
|
);
|
3434
3434
|
}
|
3435
|
-
if (tokenOrKeyword.isToken(
|
3435
|
+
if (tokenOrKeyword.isToken(27 /* Dot */) && tokenOrKeyword.parent.kind === 135 /* QualifiedName */) {
|
3436
3436
|
const qualifiedName = tokenOrKeyword.parent;
|
3437
3437
|
if (qualifiedName.parent.kind === 134 /* PackageImportTranslation */ && qualifiedName === qualifiedName.parent.sourceName) {
|
3438
3438
|
const precedingSegmentNames = qualifiedName.qualifiers.takeWhile((s) => s.rangeStart < tokenOrKeyword.value.rangeStart).map((p) => this._analyzer.createNameFromIdentifier(p)).toArray();
|
@@ -3717,41 +3717,41 @@ var CompletionService = class {
|
|
3717
3717
|
return false;
|
3718
3718
|
}
|
3719
3719
|
const tokenOrKeyword = positionDescription.tokenOrKeyword;
|
3720
|
-
return tokenOrKeyword.isToken(
|
3720
|
+
return tokenOrKeyword.isToken(21 /* CloseBrace */) && tokenOrKeyword.parent.kind === 93 /* StatementBlock */ && tokenOrKeyword.parent.parent.kind === 116 /* LoopStatement */;
|
3721
3721
|
}
|
3722
3722
|
isModifierLevelContext(positionDescription) {
|
3723
3723
|
if (positionDescription.kind !== "after-token-or-keyword") {
|
3724
3724
|
return false;
|
3725
3725
|
}
|
3726
3726
|
const tokenOrKeyword = positionDescription.tokenOrKeyword;
|
3727
|
-
return tokenOrKeyword.isToken(
|
3727
|
+
return tokenOrKeyword.isToken(45 /* OpenParenthesis */) && tokenOrKeyword.parent.kind === 149 /* Modifier */;
|
3728
3728
|
}
|
3729
3729
|
isElseOrElseIfKeywordContext(positionDescription) {
|
3730
3730
|
if (positionDescription.kind !== "after-token-or-keyword") {
|
3731
3731
|
return false;
|
3732
3732
|
}
|
3733
3733
|
const tokenOrKeyword = positionDescription.tokenOrKeyword;
|
3734
|
-
return tokenOrKeyword.isToken(
|
3734
|
+
return tokenOrKeyword.isToken(21 /* CloseBrace */) && tokenOrKeyword.parent.kind === 93 /* StatementBlock */ && (tokenOrKeyword.parent.parent.kind === 109 /* IfStatement */ && tokenOrKeyword.parent === tokenOrKeyword.parent.parent.block || tokenOrKeyword.parent.parent.kind === 111 /* ElseIfClause */);
|
3735
3735
|
}
|
3736
3736
|
isCatchKeywordContext(positionDescription) {
|
3737
3737
|
if (positionDescription.kind !== "after-token-or-keyword") {
|
3738
3738
|
return false;
|
3739
3739
|
}
|
3740
3740
|
const tokenOrKeyword = positionDescription.tokenOrKeyword;
|
3741
|
-
return tokenOrKeyword.isToken(
|
3741
|
+
return tokenOrKeyword.isToken(21 /* CloseBrace */) && tokenOrKeyword.parent.kind === 93 /* StatementBlock */ && tokenOrKeyword.parent.parent.kind === 99 /* TryStatement */;
|
3742
3742
|
}
|
3743
3743
|
isFinallyKeywordContext(positionDescription) {
|
3744
3744
|
if (positionDescription.kind !== "after-token-or-keyword") {
|
3745
3745
|
return false;
|
3746
3746
|
}
|
3747
3747
|
const tokenOrKeyword = positionDescription.tokenOrKeyword;
|
3748
|
-
return tokenOrKeyword.isToken(
|
3748
|
+
return tokenOrKeyword.isToken(21 /* CloseBrace */) && tokenOrKeyword.parent.kind === 93 /* StatementBlock */ && (tokenOrKeyword.parent.parent.kind === 99 /* TryStatement */ || tokenOrKeyword.parent.parent.kind === 100 /* CatchClause */);
|
3749
3749
|
}
|
3750
3750
|
isTypeKindCompletionContext(positionDescription) {
|
3751
|
-
return positionDescription.kind === "after-token-or-keyword" && positionDescription.tokenOrKeyword.isToken(
|
3751
|
+
return positionDescription.kind === "after-token-or-keyword" && positionDescription.tokenOrKeyword.isToken(58 /* Equals */) && NodeTypeUtils.isPackageTypeDeclaration(positionDescription.tokenOrKeyword.parent);
|
3752
3752
|
}
|
3753
3753
|
isFromKeywordContext(positionDescription) {
|
3754
|
-
if (!(positionDescription.kind === "after-token-or-keyword" && positionDescription.tokenOrKeyword.isToken(
|
3754
|
+
if (!(positionDescription.kind === "after-token-or-keyword" && positionDescription.tokenOrKeyword.isToken(10 /* Identifier */))) {
|
3755
3755
|
return false;
|
3756
3756
|
}
|
3757
3757
|
const token = positionDescription.tokenOrKeyword.value;
|
@@ -3762,7 +3762,7 @@ var CompletionService = class {
|
|
3762
3762
|
return false;
|
3763
3763
|
}
|
3764
3764
|
const tokenOrKeyword = positionDescription.tokenOrKeyword;
|
3765
|
-
if (tokenOrKeyword.isToken(
|
3765
|
+
if (tokenOrKeyword.isToken(21 /* CloseBrace */) && tokenOrKeyword.parent.kind === 93 /* StatementBlock */ && tokenOrKeyword.parent.parent.kind === 121 /* CaseClause */) {
|
3766
3766
|
return true;
|
3767
3767
|
}
|
3768
3768
|
if (syntaxContext.precedingExpression !== void 0 && syntaxContext.precedingExpression.parent.kind === 119 /* SwitchStatement */) {
|
@@ -5247,7 +5247,7 @@ var SyntaxContextFactory = class {
|
|
5247
5247
|
if (positionDescription.kind === "after-token-or-keyword") {
|
5248
5248
|
isUnqualifiedTypeContext = this.isUnqualifiedTypeContext(positionDescription.tokenOrKeyword);
|
5249
5249
|
}
|
5250
|
-
const isUnqualifiedTagNameCompletionContext = positionDescription.kind === "after-token-or-keyword" && positionDescription.tokenOrKeyword.isToken(
|
5250
|
+
const isUnqualifiedTagNameCompletionContext = positionDescription.kind === "after-token-or-keyword" && positionDescription.tokenOrKeyword.isToken(36 /* HashSign */) && positionDescription.tokenOrKeyword.parent.kind === 147 /* Tag */;
|
5251
5251
|
let isTopLevelTranslationListContext;
|
5252
5252
|
if (positionDescription.kind === "after-token-or-keyword") {
|
5253
5253
|
isTopLevelTranslationListContext = this.isTopLevelTranslationListContext(positionDescription.tokenOrKeyword);
|
@@ -5272,7 +5272,7 @@ var SyntaxContextFactory = class {
|
|
5272
5272
|
);
|
5273
5273
|
}
|
5274
5274
|
static isExpressionOrStatementContext(tokenOrKeyword) {
|
5275
|
-
if (tokenOrKeyword.isToken(
|
5275
|
+
if (tokenOrKeyword.isToken(58 /* Equals */)) {
|
5276
5276
|
if (tokenOrKeyword.parent.kind === 91 /* AssignmentStatement */) {
|
5277
5277
|
const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.right);
|
5278
5278
|
return { isExpressionContext: { expressionRole }, isStatementContext: false };
|
@@ -5330,10 +5330,10 @@ var SyntaxContextFactory = class {
|
|
5330
5330
|
isStatementContext: false
|
5331
5331
|
};
|
5332
5332
|
}
|
5333
|
-
if (tokenOrKeyword.isToken(
|
5333
|
+
if (tokenOrKeyword.isToken(44 /* OpenBrace */) && tokenOrKeyword.parent.kind === 93 /* StatementBlock */) {
|
5334
5334
|
return { isExpressionContext: { expressionRole: new ExpressionRole_other(void 0) }, isStatementContext: true };
|
5335
5335
|
}
|
5336
|
-
if (tokenOrKeyword.isToken(
|
5336
|
+
if (tokenOrKeyword.isToken(44 /* OpenBrace */) && tokenOrKeyword.parent.kind === 94 /* FunctionBlock */) {
|
5337
5337
|
const block = tokenOrKeyword.parent;
|
5338
5338
|
if (block.expressionOrStatementList.kind !== 92 /* StatementList */ || block.expressionOrStatementList.statements.count() === 0) {
|
5339
5339
|
return {
|
@@ -5347,10 +5347,10 @@ var SyntaxContextFactory = class {
|
|
5347
5347
|
};
|
5348
5348
|
}
|
5349
5349
|
}
|
5350
|
-
if (tokenOrKeyword.isToken(
|
5350
|
+
if (tokenOrKeyword.isToken(52 /* Semicolon */) && tokenOrKeyword.parent.kind === 92 /* StatementList */) {
|
5351
5351
|
return { isExpressionContext: { expressionRole: new ExpressionRole_other(void 0) }, isStatementContext: true };
|
5352
5352
|
}
|
5353
|
-
if (tokenOrKeyword.isToken(
|
5353
|
+
if (tokenOrKeyword.isToken(45 /* OpenParenthesis */)) {
|
5354
5354
|
if (tokenOrKeyword.parent.kind === 75 /* ParenthesizedExpression */) {
|
5355
5355
|
const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.expression);
|
5356
5356
|
return { isExpressionContext: { expressionRole }, isStatementContext: false };
|
@@ -5379,15 +5379,15 @@ var SyntaxContextFactory = class {
|
|
5379
5379
|
return { isExpressionContext: { expressionRole }, isStatementContext: false };
|
5380
5380
|
}
|
5381
5381
|
}
|
5382
|
-
if (tokenOrKeyword.isToken(
|
5382
|
+
if (tokenOrKeyword.isToken(46 /* OpenSquareBracket */) && tokenOrKeyword.parent.kind === 71 /* IndexedAccessExpression */) {
|
5383
5383
|
const expressionRole = new ExpressionRole_argument(tokenOrKeyword.parent.argumentList, 0);
|
5384
5384
|
return { isExpressionContext: { expressionRole }, isStatementContext: false };
|
5385
5385
|
}
|
5386
|
-
if (tokenOrKeyword.isToken(
|
5386
|
+
if (tokenOrKeyword.isToken(46 /* OpenSquareBracket */) && tokenOrKeyword.parent.kind === 61 /* ArrayLiteral */) {
|
5387
5387
|
const expressionRole = new ExpressionRole_arrayElement(tokenOrKeyword.parent);
|
5388
5388
|
return { isExpressionContext: { expressionRole }, isStatementContext: false };
|
5389
5389
|
}
|
5390
|
-
if (tokenOrKeyword.isToken(
|
5390
|
+
if (tokenOrKeyword.isToken(25 /* Comma */)) {
|
5391
5391
|
if (tokenOrKeyword.parent.kind === 68 /* ArgumentList */) {
|
5392
5392
|
const argumentList = tokenOrKeyword.parent;
|
5393
5393
|
let index = 0;
|
@@ -5482,16 +5482,16 @@ var SyntaxContextFactory = class {
|
|
5482
5482
|
return { isExpressionContext: void 0, isStatementContext: false };
|
5483
5483
|
}
|
5484
5484
|
static isPackageMemberDeclarationListContext(tokenOrKeyword) {
|
5485
|
-
if (tokenOrKeyword.isToken(
|
5485
|
+
if (tokenOrKeyword.isToken(52 /* Semicolon */) && (tokenOrKeyword.parent.kind === 2 /* PackageMemberDeclarationList */ || tokenOrKeyword.parent.kind === 4 /* PackageImportDirectiveList */)) {
|
5486
5486
|
return true;
|
5487
5487
|
}
|
5488
|
-
if (tokenOrKeyword.isToken(
|
5488
|
+
if (tokenOrKeyword.isToken(21 /* CloseBrace */) && tokenOrKeyword.parent.kind === 32 /* TypeMemberDeclarationBlock */ && (tokenOrKeyword.parent.parent.kind === 40 /* TypeExtensionDeclaration */ || tokenOrKeyword.parent.parent.parent.kind === 33 /* PackageStructuredTypeDeclaration */ || tokenOrKeyword.parent.parent.parent.kind === 38 /* PackageVariantTypeDeclaration */ || tokenOrKeyword.parent.parent.parent.kind === 22 /* PackageAliasTypeDeclaration */)) {
|
5489
5489
|
return true;
|
5490
5490
|
}
|
5491
|
-
if (tokenOrKeyword.isToken(
|
5491
|
+
if (tokenOrKeyword.isToken(21 /* CloseBrace */) && (tokenOrKeyword.parent.kind === 21 /* TranslationsDeclaration */ || tokenOrKeyword.parent.kind === 24 /* PackageMemberGroupDeclaration */ || tokenOrKeyword.parent.kind === 6 /* PackageGroupImportDirective */ || tokenOrKeyword.parent.kind === 94 /* FunctionBlock */ && (tokenOrKeyword.parent.parent.kind === 25 /* PackageConstructorDeclaration */ || tokenOrKeyword.parent.parent.kind === 26 /* PackageEntryPointDeclaration */ || tokenOrKeyword.parent.parent.kind === 27 /* PackageFunctionDeclaration */))) {
|
5492
5492
|
return true;
|
5493
5493
|
}
|
5494
|
-
if (tokenOrKeyword.isToken(
|
5494
|
+
if (tokenOrKeyword.isToken(44 /* OpenBrace */) && tokenOrKeyword.parent.kind === 24 /* PackageMemberGroupDeclaration */) {
|
5495
5495
|
return true;
|
5496
5496
|
}
|
5497
5497
|
if (SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 5 /* SinglePackageImportDirective */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 27 /* PackageFunctionDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 28 /* PackageFunctionTypeDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 22 /* PackageAliasTypeDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 35 /* PackageVariableDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(
|
@@ -5503,7 +5503,7 @@ var SyntaxContextFactory = class {
|
|
5503
5503
|
if (tokenOrKeyword.isKeyword() && tokenOrKeyword.parent.kind === 149 /* Modifier */ && tokenOrKeyword.value === tokenOrKeyword.parent.value && tokenOrKeyword.parent.openParenthesisToken === void 0 && NodeTypeUtils.isPackageMemberDeclaration(tokenOrKeyword.parent.parent.parent)) {
|
5504
5504
|
return true;
|
5505
5505
|
}
|
5506
|
-
if (tokenOrKeyword.isToken(
|
5506
|
+
if (tokenOrKeyword.isToken(22 /* CloseParenthesis */) && tokenOrKeyword.parent.kind === 149 /* Modifier */ && NodeTypeUtils.isPackageMemberDeclaration(tokenOrKeyword.parent.parent.parent)) {
|
5507
5507
|
return true;
|
5508
5508
|
}
|
5509
5509
|
const tag = SyntaxContextUtils.ifTokenIsValidEndOfNodeThenNode(tokenOrKeyword, 147 /* Tag */);
|
@@ -5513,13 +5513,13 @@ var SyntaxContextFactory = class {
|
|
5513
5513
|
return false;
|
5514
5514
|
}
|
5515
5515
|
static isTypeMemberDeclarationListContext(tokenOrKeyword) {
|
5516
|
-
if (tokenOrKeyword.isToken(
|
5516
|
+
if (tokenOrKeyword.isToken(52 /* Semicolon */) && tokenOrKeyword.parent.kind === 31 /* TypeMemberDeclarationList */) {
|
5517
5517
|
return true;
|
5518
5518
|
}
|
5519
|
-
if (tokenOrKeyword.isToken(
|
5519
|
+
if (tokenOrKeyword.isToken(44 /* OpenBrace */) && tokenOrKeyword.parent.kind === 32 /* TypeMemberDeclarationBlock */) {
|
5520
5520
|
return true;
|
5521
5521
|
}
|
5522
|
-
if (tokenOrKeyword.isToken(
|
5522
|
+
if (tokenOrKeyword.isToken(21 /* CloseBrace */) && tokenOrKeyword.parent.kind === 32 /* TypeMemberDeclarationBlock */ && tokenOrKeyword.parent.parent.kind === 44 /* TypeMemberGroupDeclaration */) {
|
5523
5523
|
return true;
|
5524
5524
|
}
|
5525
5525
|
if (SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 54 /* FieldDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 55 /* FieldGetterDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 56 /* FieldSetterDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(
|
@@ -5540,7 +5540,7 @@ var SyntaxContextFactory = class {
|
|
5540
5540
|
if (tokenOrKeyword.isKeyword() && tokenOrKeyword.parent.kind === 149 /* Modifier */ && tokenOrKeyword.value === tokenOrKeyword.parent.value && tokenOrKeyword.parent.openParenthesisToken === void 0 && NodeTypeUtils.isTypeMemberDeclaration(tokenOrKeyword.parent.parent.parent)) {
|
5541
5541
|
return true;
|
5542
5542
|
}
|
5543
|
-
if (tokenOrKeyword.isToken(
|
5543
|
+
if (tokenOrKeyword.isToken(22 /* CloseParenthesis */) && tokenOrKeyword.parent.kind === 149 /* Modifier */ && NodeTypeUtils.isTypeMemberDeclaration(tokenOrKeyword.parent.parent.parent)) {
|
5544
5544
|
return true;
|
5545
5545
|
}
|
5546
5546
|
const tag = SyntaxContextUtils.ifTokenIsValidEndOfNodeThenNode(tokenOrKeyword, 147 /* Tag */);
|
@@ -5581,7 +5581,7 @@ var SyntaxContextFactory = class {
|
|
5581
5581
|
return result;
|
5582
5582
|
}
|
5583
5583
|
static isUnqualifiedTypeContext(tokenOrKeyword) {
|
5584
|
-
if (tokenOrKeyword.isToken(
|
5584
|
+
if (tokenOrKeyword.isToken(24 /* Colon */) && tokenOrKeyword.parent.kind === 156 /* TypeAnnotation */) {
|
5585
5585
|
return { allowsAnonymousTypes: true };
|
5586
5586
|
}
|
5587
5587
|
if ((tokenOrKeyword.isKeyword(4 /* Object */) || tokenOrKeyword.isKeyword(5 /* PlainObject */) || tokenOrKeyword.isKeyword(3 /* Aspect */)) && tokenOrKeyword.parent.kind === 34 /* StructuredTypeDeclarationBody */) {
|
@@ -5590,19 +5590,19 @@ var SyntaxContextFactory = class {
|
|
5590
5590
|
if (tokenOrKeyword.isKeyword(16 /* Type */) && (NodeTypeUtils.isPackageTypeDeclaration(tokenOrKeyword.parent) || tokenOrKeyword.parent.kind === 40 /* TypeExtensionDeclaration */)) {
|
5591
5591
|
return { allowsAnonymousTypes: false };
|
5592
5592
|
}
|
5593
|
-
if (tokenOrKeyword.isToken(
|
5593
|
+
if (tokenOrKeyword.isToken(37 /* LessThan */) && tokenOrKeyword.parent.kind === 152 /* TypeArgumentClause */) {
|
5594
5594
|
return { allowsAnonymousTypes: true };
|
5595
5595
|
}
|
5596
|
-
if (tokenOrKeyword.isToken(
|
5596
|
+
if (tokenOrKeyword.isToken(25 /* Comma */) && (tokenOrKeyword.parent.kind === 30 /* BaseTypeList */ || tokenOrKeyword.parent.kind === 153 /* TypeArgumentList */)) {
|
5597
5597
|
return { allowsAnonymousTypes: tokenOrKeyword.parent.kind === 153 /* TypeArgumentList */ };
|
5598
5598
|
}
|
5599
|
-
if (tokenOrKeyword.isToken(
|
5599
|
+
if (tokenOrKeyword.isToken(36 /* HashSign */) && tokenOrKeyword.parent.kind === 147 /* Tag */) {
|
5600
5600
|
return { allowsAnonymousTypes: false };
|
5601
5601
|
}
|
5602
|
-
if ((tokenOrKeyword.isToken(
|
5602
|
+
if ((tokenOrKeyword.isToken(24 /* Colon */) || tokenOrKeyword.isToken(58 /* Equals */)) && tokenOrKeyword.parent.kind === 143 /* TypeParameterDeclaration */) {
|
5603
5603
|
return { allowsAnonymousTypes: false };
|
5604
5604
|
}
|
5605
|
-
if (tokenOrKeyword.isToken(
|
5605
|
+
if (tokenOrKeyword.isToken(58 /* Equals */) && tokenOrKeyword.parent.kind === 22 /* PackageAliasTypeDeclaration */) {
|
5606
5606
|
return { allowsAnonymousTypes: false };
|
5607
5607
|
}
|
5608
5608
|
if (tokenOrKeyword.isKeyword(14 /* Is */) && tokenOrKeyword.parent.kind === 73 /* IsExpression */) {
|
@@ -5611,22 +5611,22 @@ var SyntaxContextFactory = class {
|
|
5611
5611
|
if (tokenOrKeyword.isKeyword(42 /* As */) && tokenOrKeyword.parent.kind === 65 /* AsExpression */) {
|
5612
5612
|
return { allowsAnonymousTypes: true };
|
5613
5613
|
}
|
5614
|
-
if (tokenOrKeyword.isToken(
|
5614
|
+
if (tokenOrKeyword.isToken(18 /* Bar */) && tokenOrKeyword.parent.kind === 11 /* UnionTypeSpecifier */) {
|
5615
5615
|
return { allowsAnonymousTypes: false };
|
5616
5616
|
}
|
5617
|
-
if (tokenOrKeyword.isToken(
|
5617
|
+
if (tokenOrKeyword.isToken(11 /* Ampersand */) && tokenOrKeyword.parent.kind === 12 /* IntersectionTypeSpecifier */) {
|
5618
5618
|
return { allowsAnonymousTypes: false };
|
5619
5619
|
}
|
5620
|
-
if (tokenOrKeyword.isToken(
|
5620
|
+
if (tokenOrKeyword.isToken(45 /* OpenParenthesis */) && tokenOrKeyword.parent.kind === 13 /* ParenthesizedTypeSpecifier */) {
|
5621
5621
|
return { allowsAnonymousTypes: true };
|
5622
5622
|
}
|
5623
5623
|
return void 0;
|
5624
5624
|
}
|
5625
5625
|
static isTopLevelTranslationListContext(tokenOrKeyword) {
|
5626
|
-
if (tokenOrKeyword.isToken(
|
5626
|
+
if (tokenOrKeyword.isToken(52 /* Semicolon */) && tokenOrKeyword.parent.kind === 20 /* TopLevelTranslationList */) {
|
5627
5627
|
return { translationsDeclaration: tokenOrKeyword.parent.parent };
|
5628
5628
|
}
|
5629
|
-
if (tokenOrKeyword.isToken(
|
5629
|
+
if (tokenOrKeyword.isToken(44 /* OpenBrace */) && tokenOrKeyword.parent.kind === 21 /* TranslationsDeclaration */) {
|
5630
5630
|
return { translationsDeclaration: tokenOrKeyword.parent };
|
5631
5631
|
}
|
5632
5632
|
const packageImport = SyntaxContextUtils.ifTokenIsValidEndOfNodeThenNode(
|
@@ -5664,10 +5664,10 @@ var SyntaxContextFactory = class {
|
|
5664
5664
|
return void 0;
|
5665
5665
|
}
|
5666
5666
|
static isTypeMemberTranslationListContext(tokenOrKeyword) {
|
5667
|
-
if (tokenOrKeyword.isToken(
|
5667
|
+
if (tokenOrKeyword.isToken(52 /* Semicolon */) && tokenOrKeyword.parent.kind === 138 /* TypeMemberTranslationList */) {
|
5668
5668
|
return { typeTranslation: tokenOrKeyword.parent.parent };
|
5669
5669
|
}
|
5670
|
-
if (tokenOrKeyword.isToken(
|
5670
|
+
if (tokenOrKeyword.isToken(44 /* OpenBrace */) && tokenOrKeyword.parent.kind === 139 /* TypeTranslation */) {
|
5671
5671
|
return { typeTranslation: tokenOrKeyword.parent };
|
5672
5672
|
}
|
5673
5673
|
const indexer = SyntaxContextUtils.ifTokenIsValidEndOfNodeThenNode(tokenOrKeyword, 128 /* IndexerTranslation */);
|
@@ -5809,23 +5809,23 @@ var NodeSemanticInfoService = class {
|
|
5809
5809
|
return this.ofPrefixUnaryExpressionOperator(analyzer, tokenOrKeyword.parent, options6);
|
5810
5810
|
} else if (tokenOrKeyword.parent.kind === 66 /* BinaryExpression */) {
|
5811
5811
|
return this.ofBinaryExpressionOperator(analyzer, tokenOrKeyword.parent, options6);
|
5812
|
-
} else if (tokenOrKeyword.isToken(
|
5812
|
+
} else if (tokenOrKeyword.isToken(20 /* Caret */) && (tokenOrKeyword.parent.kind === 50 /* DereferencedVariableGetterDeclaration */ || tokenOrKeyword.parent.kind === 51 /* DereferencedVariableSetterDeclaration */)) {
|
5813
5813
|
return this.ofDereferenceOperatorDeclaration(analyzer, tokenOrKeyword.parent);
|
5814
|
-
} else if (tokenOrKeyword.isToken(
|
5814
|
+
} else if (tokenOrKeyword.isToken(20 /* Caret */) && tokenOrKeyword.parent.kind === 80 /* DereferenceExpression */) {
|
5815
5815
|
return this.ofDereferenceExpressionOperator(analyzer, tokenOrKeyword.parent, options6);
|
5816
5816
|
} else if (tokenOrKeyword.parent.kind === 91 /* AssignmentStatement */) {
|
5817
5817
|
return this.ofAssignmentStatementOperator(analyzer, tokenOrKeyword.parent, options6);
|
5818
5818
|
} else if (tokenOrKeyword.isKeyword(31 /* Creation */) && tokenOrKeyword.parent.kind === 45 /* ConstructorDeclaration */) {
|
5819
5819
|
return this.ofConstructorDeclaration(analyzer, tokenOrKeyword.parent);
|
5820
|
-
} else if (tokenOrKeyword.isToken(
|
5820
|
+
} else if (tokenOrKeyword.isToken(14 /* Asterisk */) && tokenOrKeyword.parent.kind === 90 /* DefaultMatchExpression */) {
|
5821
5821
|
return this.ofDefaultMatchExpression(analyzer, tokenOrKeyword.parent);
|
5822
5822
|
} else if (tokenOrKeyword.isKeyword(4 /* Object */) && tokenOrKeyword.parent.kind === 86 /* ObjectExpression */) {
|
5823
5823
|
return this.ofObjectExpression(analyzer, tokenOrKeyword.parent, options6);
|
5824
5824
|
} else if (tokenOrKeyword.isKeyword(56 /* Base */) && tokenOrKeyword.parent.kind === 87 /* BaseExpression */) {
|
5825
5825
|
return this.ofBaseExpression(analyzer, tokenOrKeyword.parent, options6);
|
5826
|
-
} else if ((tokenOrKeyword.isToken(
|
5826
|
+
} else if ((tokenOrKeyword.isToken(46 /* OpenSquareBracket */) || tokenOrKeyword.isToken(23 /* CloseSquareBracket */)) && tokenOrKeyword.parent.kind === 49 /* IndexParameterClause */) {
|
5827
5827
|
return this.ofIndexedElementAccessorDeclaration(analyzer, tokenOrKeyword.parent.parent);
|
5828
|
-
} else if ((tokenOrKeyword.isToken(
|
5828
|
+
} else if ((tokenOrKeyword.isToken(46 /* OpenSquareBracket */) || tokenOrKeyword.isToken(23 /* CloseSquareBracket */)) && tokenOrKeyword.parent.kind === 71 /* IndexedAccessExpression */) {
|
5829
5829
|
return this.ofIndexedAccessExpressionOperator(analyzer, tokenOrKeyword.parent, options6);
|
5830
5830
|
}
|
5831
5831
|
return void 0;
|
@@ -7024,9 +7024,9 @@ var DefinitionService = class {
|
|
7024
7024
|
getDefinition(analyzer, sourceFile, offset, cancellationToken) {
|
7025
7025
|
return __async(this, null, function* () {
|
7026
7026
|
const tokenOrKeyword = getTokenOrKeywordsTouchingOffset(sourceFile.getSyntaxNode(), offset).getSingleWithHighestPriority((t) => {
|
7027
|
-
if (t.isToken(
|
7027
|
+
if (t.isToken(10 /* Identifier */) || t.isKeyword()) {
|
7028
7028
|
return 2;
|
7029
|
-
} else if (t.isToken(
|
7029
|
+
} else if (t.isToken(20 /* Caret */) || t.isToken(46 /* OpenSquareBracket */) || t.isToken(23 /* CloseSquareBracket */)) {
|
7030
7030
|
return 1;
|
7031
7031
|
} else {
|
7032
7032
|
return 0;
|
@@ -7481,9 +7481,9 @@ var ReferencesService = class {
|
|
7481
7481
|
}
|
7482
7482
|
getDefinitionAndReferenceInfoAtOffset(analyzer, sourceFile, offset, options6) {
|
7483
7483
|
const tokenOrKeyword = getTokenOrKeywordsTouchingOffset(sourceFile.getSyntaxNode(), offset).getSingleWithHighestPriority((t) => {
|
7484
|
-
if (t.isToken(
|
7484
|
+
if (t.isToken(10 /* Identifier */) || t.isKeyword()) {
|
7485
7485
|
return 2;
|
7486
|
-
} else if (t.isToken(
|
7486
|
+
} else if (t.isToken(20 /* Caret */) || t.isToken(46 /* OpenSquareBracket */) || t.isToken(23 /* CloseSquareBracket */)) {
|
7487
7487
|
return 1;
|
7488
7488
|
} else {
|
7489
7489
|
return 0;
|
@@ -7948,11 +7948,11 @@ var FileSystemTreeDisplayService = class _FileSystemTreeDisplayService {
|
|
7948
7948
|
var HoverService = class {
|
7949
7949
|
getHover(analyzer, sourceFile, offset) {
|
7950
7950
|
const tokenOrKeyword = getTokenOrKeywordsTouchingOffset(sourceFile.getSyntaxNode(), offset).getSingleWithHighestPriority((t) => {
|
7951
|
-
if (t.isToken(
|
7951
|
+
if (t.isToken(10 /* Identifier */) || t.isKeyword()) {
|
7952
7952
|
return 2;
|
7953
|
-
} else if (t.isToken(
|
7953
|
+
} else if (t.isToken(14 /* Asterisk */)) {
|
7954
7954
|
return 1;
|
7955
|
-
} else if (t.isToken(
|
7955
|
+
} else if (t.isToken(20 /* Caret */) || t.isToken(46 /* OpenSquareBracket */) || t.isToken(23 /* CloseSquareBracket */)) {
|
7956
7956
|
return 1;
|
7957
7957
|
} else {
|
7958
7958
|
return 0;
|
@@ -8594,7 +8594,7 @@ var SelectionRangeService = class {
|
|
8594
8594
|
}
|
8595
8595
|
nodeContainsOffset(node, offset, searchInTrivia) {
|
8596
8596
|
const range = searchInTrivia ? node.rangeWithTrivia : node.rangeWithoutTrivia;
|
8597
|
-
if (node.kind === 0 /* Token */ && node.tokenKind ===
|
8597
|
+
if (node.kind === 0 /* Token */ && node.tokenKind === 10 /* Identifier */ || node.kind === 3 /* Keyword */) {
|
8598
8598
|
return offset >= range.start && offset <= range.end;
|
8599
8599
|
} else {
|
8600
8600
|
return offset >= range.start && offset < range.end;
|
@@ -12224,7 +12224,7 @@ var EntityToSyntax = class {
|
|
12224
12224
|
return [];
|
12225
12225
|
}
|
12226
12226
|
getEntityName(entity) {
|
12227
|
-
return this._localizationContext?.getEntityName(entity).unescapedOriginal ?? entity.getName().unescapedOriginal;
|
12227
|
+
return this._localizationContext?.getEntityName(entity).value.unescapedOriginal ?? entity.getName().unescapedOriginal;
|
12228
12228
|
}
|
12229
12229
|
convertType(type) {
|
12230
12230
|
switch (type.kind) {
|
@@ -12822,7 +12822,7 @@ var EntityFinder = class {
|
|
12822
12822
|
return -1;
|
12823
12823
|
}
|
12824
12824
|
getEntityName(entity) {
|
12825
|
-
return this._localizationContext?.getEntityName(entity) ?? entity.getName();
|
12825
|
+
return this._localizationContext?.getEntityName(entity).value ?? entity.getName();
|
12826
12826
|
}
|
12827
12827
|
};
|
12828
12828
|
var DataForFindingOverloadedMember = class {
|