@artel/artc 0.6.25264 → 0.6.25266
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 -10
- package/build/api/ApiNodeJS.js +3 -3
- package/build/api/ApiServices.js +327 -341
- package/build/{chunk-3V2UPAG3.js → chunk-2Y343AG7.js} +1 -1
- package/build/{chunk-WTJNZUBE.js → chunk-4YMBG4SM.js} +3664 -2958
- package/build/{chunk-26UG42AZ.js → chunk-MHMPJB2Y.js} +2 -2
- package/build/types/analysis/AnalyzedTextTranslationPackage.d.ts +21 -0
- package/build/types/analysis/Analyzer.d.ts +15 -9
- package/build/types/analysis/DiagnosticCollector.d.ts +2 -0
- package/build/types/analysis/control-flow/NarrowableReference.d.ts +3 -3
- package/build/types/analysis/semantic-context/SemanticContext.d.ts +2 -3
- package/build/types/analysis/semantic-context/SemanticContextBase.d.ts +11 -1
- package/build/types/analysis/semantic-context/SemanticContextBuilder.d.ts +10 -10
- package/build/types/analysis/semantic-context/SemanticContextValidatingNameConflicts.d.ts +7 -7
- package/build/types/analysis/semantic-context/SpecialLocalDeclarationsBuilder.d.ts +1 -0
- package/build/types/analysis/semantic-context/SubprogramBodyAndParametersSemanticContext.d.ts +34 -12
- package/build/types/analysis/semantic-context/SubprogramSemanticContext.d.ts +9 -0
- package/build/types/common/Query.d.ts +1 -0
- package/build/types/diagnostic/DiagnosticCode.d.ts +1 -0
- package/build/types/emitter/EmitPhaseName.d.ts +3 -0
- package/build/types/emitter/Emitter.d.ts +1 -2
- package/build/types/emitter/EmitterContext.d.ts +1 -0
- package/build/types/emitter/Entities.d.ts +5 -0
- package/build/types/emitter/GeneralLowering.d.ts +1 -2
- package/build/types/emitter/IrBuilder.d.ts +5 -3
- package/build/types/emitter/IrFactory.d.ts +118 -0
- package/build/types/emitter/Transformer.d.ts +0 -2
- package/build/types/emitter/ir/Nodes.d.ts +328 -323
- package/build/types/emitter/ir/types.d.ts +2 -2
- package/build/types/entities/PackageEntity.d.ts +14 -3
- package/build/types/entities/StructuredTypeEntity.d.ts +1 -0
- package/build/types/entities/TextTranslationEntity.d.ts +45 -0
- package/build/types/entities/VariableEntity.d.ts +7 -16
- package/build/types/entities/index.d.ts +4 -4
- package/build/types/entities/translated/TranslatedPackageEntity.d.ts +3 -2
- package/build/types/parser/TokenKind.d.ts +56 -55
- package/build/types/parser/UnescapeText.d.ts +1 -0
- package/build/types/project/SourcePackage.d.ts +7 -3
- package/build/types/project/configuration/ConfigurationConverter.d.ts +3 -0
- package/build/types/project/configuration/types/PackageConfigurationEn.d.ts +3 -0
- package/build/types/project/configuration/types/PackageConfigurationRu.d.ts +3 -0
- package/build/types/services/DisplayService.d.ts +1 -1
- package/build/types/services/NodeSemanticInfo.d.ts +8 -2
- package/build/types/tree/NodeKind.d.ts +21 -20
- package/build/types/tree/Nodes.d.ts +45 -18
- package/build/types/tree/Token.d.ts +4 -1
- package/build/types/ts-interop/Entities.d.ts +5 -3
- package/build/types/ts-interop/TsInteropContext.d.ts +3 -2
- package/package.json +1 -1
- package/build/types/analysis/semantic-context/TranslationTextTemplateSemanticContext.d.ts +0 -13
- package/build/types/entities/LocalizableTextEntity.d.ts +0 -80
package/build/api/ApiServices.js
CHANGED
|
@@ -76,6 +76,7 @@ import {
|
|
|
76
76
|
NodeTypeUtils,
|
|
77
77
|
NullableTypeSpecifier,
|
|
78
78
|
OperatorDeclaration_typeMember,
|
|
79
|
+
Option,
|
|
79
80
|
PackageAliasTypeDeclaration,
|
|
80
81
|
PackageFunctionDeclaration,
|
|
81
82
|
PackageFunctionTranslationDeclaration,
|
|
@@ -181,7 +182,7 @@ import {
|
|
|
181
182
|
unwrapParenthesizedExpressions,
|
|
182
183
|
visitChildren,
|
|
183
184
|
yieldExecution
|
|
184
|
-
} from "../chunk-
|
|
185
|
+
} from "../chunk-4YMBG4SM.js";
|
|
185
186
|
|
|
186
187
|
// source/services/CustomCommand.ts
|
|
187
188
|
import * as ls from "vscode-languageserver";
|
|
@@ -2086,16 +2087,16 @@ var SyntaxToCode = class _SyntaxToCode {
|
|
|
2086
2087
|
[94 /* StatementBlock */]: this.prototype.writeStatementBlock,
|
|
2087
2088
|
[95 /* FunctionBlock */]: this.prototype.writeFunctionBlock,
|
|
2088
2089
|
[137 /* QualifiedName */]: this.prototype.writeQualifiedName,
|
|
2089
|
-
[
|
|
2090
|
-
[
|
|
2091
|
-
[
|
|
2092
|
-
[
|
|
2093
|
-
[
|
|
2094
|
-
[
|
|
2095
|
-
[
|
|
2096
|
-
[
|
|
2097
|
-
[
|
|
2098
|
-
[
|
|
2090
|
+
[149 /* VariantDeclaration */]: this.prototype.writeVariantDeclaration,
|
|
2091
|
+
[150 /* TypeParameterDeclaration */]: this.prototype.writeTypeParameterDeclaration,
|
|
2092
|
+
[151 /* ParameterDeclaration */]: this.prototype.writeParameterDeclaration,
|
|
2093
|
+
[152 /* Argument */]: this.prototype.writeArgument,
|
|
2094
|
+
[154 /* Tag */]: this.prototype.writeTag,
|
|
2095
|
+
[156 /* Modifier */]: this.prototype.writeModifier,
|
|
2096
|
+
[157 /* ParameterClause */]: this.prototype.writeParameterClause,
|
|
2097
|
+
[158 /* ParameterList */]: this.prototype.writeParameterList,
|
|
2098
|
+
[159 /* TypeArgumentClause */]: this.prototype.writeTypeArgumentClause,
|
|
2099
|
+
[161 /* TypeParameterClause */]: this.prototype.writeTypeParameterClause,
|
|
2099
2100
|
[17 /* AnonymousFunctionTypeDeclaration */]: this.prototype.writeAnonymousFunctionTypeDeclaration,
|
|
2100
2101
|
[18 /* AnonymousStructuredTypeDeclaration */]: this.prototype.writeAnonymousStructuredTypeDeclaration,
|
|
2101
2102
|
[19 /* AnonymousVariantTypeDeclaration */]: this.prototype.writeAnonymousVariantTypeDeclaration,
|
|
@@ -2194,16 +2195,17 @@ var SyntaxToCode = class _SyntaxToCode {
|
|
|
2194
2195
|
[140 /* TypeMemberTranslationList */]: this.prototype.writeNodeDefault,
|
|
2195
2196
|
[141 /* TypeTranslationDeclaration */]: this.prototype.writeTypeTranslation,
|
|
2196
2197
|
[142 /* TextTranslationDeclaration */]: this.prototype.writeNodeDefault,
|
|
2197
|
-
[
|
|
2198
|
-
[
|
|
2199
|
-
[
|
|
2200
|
-
[
|
|
2201
|
-
[162 /*
|
|
2202
|
-
[
|
|
2203
|
-
[144 /*
|
|
2204
|
-
[145 /*
|
|
2205
|
-
[146 /*
|
|
2206
|
-
[147 /*
|
|
2198
|
+
[143 /* TextTranslationFunctionDeclaration */]: this.prototype.writeNodeDefault,
|
|
2199
|
+
[153 /* TagList */]: this.prototype.writeNodeDefault,
|
|
2200
|
+
[155 /* ModifierList */]: this.prototype.writeNodeDefault,
|
|
2201
|
+
[160 /* TypeArgumentList */]: this.prototype.writeNodeDefault,
|
|
2202
|
+
[162 /* TypeParameterList */]: this.prototype.writeNodeDefault,
|
|
2203
|
+
[163 /* TypeAnnotation */]: this.prototype.writeNodeDefault,
|
|
2204
|
+
[144 /* TranslationTextLiteral */]: this.prototype.writeNodeDefault,
|
|
2205
|
+
[145 /* TranslationTextTemplate */]: this.prototype.writeNodeDefault,
|
|
2206
|
+
[146 /* TranslationTextTemplateSpanList */]: this.prototype.writeNodeDefault,
|
|
2207
|
+
[147 /* TranslationTextTemplateSpan */]: this.prototype.writeNodeDefault,
|
|
2208
|
+
[148 /* TranslationTextTemplateParameter */]: this.prototype.writeNodeDefault
|
|
2207
2209
|
};
|
|
2208
2210
|
return writeFunctions;
|
|
2209
2211
|
}
|
|
@@ -2876,7 +2878,7 @@ var SignatureForNode = class _SignatureForNode {
|
|
|
2876
2878
|
return _SignatureForNode.getSignaturesForAutotypeCallExpression(analyzer, node);
|
|
2877
2879
|
case 70 /* IndexedAccessExpression */:
|
|
2878
2880
|
return _SignatureForNode.getSignaturesForIndexedAccessExpression(analyzer, node);
|
|
2879
|
-
case
|
|
2881
|
+
case 154 /* Tag */:
|
|
2880
2882
|
return _SignatureForNode.getSignaturesForTag(analyzer, node);
|
|
2881
2883
|
default:
|
|
2882
2884
|
Debug.never(node);
|
|
@@ -3377,7 +3379,7 @@ var CompletionService = class {
|
|
|
3377
3379
|
}
|
|
3378
3380
|
return { kind: "none" };
|
|
3379
3381
|
}
|
|
3380
|
-
if (tokenOrKeyword.isToken(27 /* Dot */) && tokenOrKeyword.parent.kind === 137 /* QualifiedName */ && tokenOrKeyword.parent.parent.kind ===
|
|
3382
|
+
if (tokenOrKeyword.isToken(27 /* Dot */) && tokenOrKeyword.parent.kind === 137 /* QualifiedName */ && tokenOrKeyword.parent.parent.kind === 154 /* Tag */) {
|
|
3381
3383
|
const tag = tokenOrKeyword.parent.parent;
|
|
3382
3384
|
const resolutionResult = this.analyzer.resolveTag(tag);
|
|
3383
3385
|
const segmentIndex = Math.floor(
|
|
@@ -3531,9 +3533,7 @@ var CompletionService = class {
|
|
|
3531
3533
|
const sourceLocale = translationPackage.getTargetPackage().getLocale();
|
|
3532
3534
|
let type;
|
|
3533
3535
|
if (this.sourceFile.package.kind === "translation") {
|
|
3534
|
-
const translationPackage2 = this.analyzer.getAnalyzedTranslationPackageIfTargetResolved(
|
|
3535
|
-
this.sourceFile.package
|
|
3536
|
-
);
|
|
3536
|
+
const translationPackage2 = this.analyzer.getAnalyzedTranslationPackageIfTargetResolved(this.sourceFile.package);
|
|
3537
3537
|
type = translationPackage2?.getTypeTranslationTarget(typeTranslation).target;
|
|
3538
3538
|
}
|
|
3539
3539
|
const hidingMatcher = semanticContext.getHidingMatcher();
|
|
@@ -3558,11 +3558,9 @@ var CompletionService = class {
|
|
|
3558
3558
|
break;
|
|
3559
3559
|
case 69 /* AutotypeCallExpression */:
|
|
3560
3560
|
signatures = SignatureForNode.getSignaturesForAutotypeCallExpression(this.analyzer, role.argumentList.parent);
|
|
3561
|
-
args = ArgumentFactory.createArgumentsOfAutotypeCallExpression(
|
|
3562
|
-
role.argumentList.parent
|
|
3563
|
-
);
|
|
3561
|
+
args = ArgumentFactory.createArgumentsOfAutotypeCallExpression(role.argumentList.parent);
|
|
3564
3562
|
break;
|
|
3565
|
-
case
|
|
3563
|
+
case 154 /* Tag */:
|
|
3566
3564
|
signatures = SignatureForNode.getSignaturesForTag(this.analyzer, role.argumentList.parent);
|
|
3567
3565
|
args = ArgumentFactory.createArgumentsOfTag(role.argumentList.parent);
|
|
3568
3566
|
break;
|
|
@@ -3629,18 +3627,14 @@ var CompletionService = class {
|
|
|
3629
3627
|
Debug.never(role);
|
|
3630
3628
|
}
|
|
3631
3629
|
getTargetTypesAndTargetSignaturesParametersFromSignatures(signatures, args, argumentIndex) {
|
|
3632
|
-
const matchedSignatures = signatures.map(
|
|
3633
|
-
(s) => new MatchedSignature(s, SimplifiedArgumentToParameterMatcher.match(this.analyzer, args, s))
|
|
3634
|
-
);
|
|
3630
|
+
const matchedSignatures = signatures.map((s) => new MatchedSignature(s, SimplifiedArgumentToParameterMatcher.match(this.analyzer, args, s)));
|
|
3635
3631
|
if (matchedSignatures.length === 1) {
|
|
3636
3632
|
const signature = matchedSignatures[0];
|
|
3637
3633
|
const targetType = signature.matchResult.parameterByArgumentIndex.at(argumentIndex)?.type;
|
|
3638
3634
|
const targetSignaturesParameters = signature.value.getParameters();
|
|
3639
3635
|
return { targetTypes: targetType !== void 0 ? [targetType] : void 0, targetSignaturesParameters };
|
|
3640
3636
|
} else {
|
|
3641
|
-
const suitableSignatures = Query.from(matchedSignatures).mapAndFilter(
|
|
3642
|
-
(s) => SimplifiedOverloadResolver.isSuitableSignature(this.analyzer, s, args) ? s : void 0
|
|
3643
|
-
).toArray();
|
|
3637
|
+
const suitableSignatures = Query.from(matchedSignatures).mapAndFilter((s) => SimplifiedOverloadResolver.isSuitableSignature(this.analyzer, s, args) ? s : void 0).toArray();
|
|
3644
3638
|
const targetTypes = Query.from(suitableSignatures).mapAndFilter((s) => s.matchResult.parameterByArgumentIndex.at(argumentIndex)?.type).toArray();
|
|
3645
3639
|
const targetSignaturesParameters = Query.from(suitableSignatures).flatMap((s) => s.value.getParameters()).toArray();
|
|
3646
3640
|
return { targetTypes, targetSignaturesParameters };
|
|
@@ -3765,9 +3759,7 @@ var CompletionService = class {
|
|
|
3765
3759
|
if (positionDescription.kind === "after-token-or-keyword" && positionDescription.tokenOrKeyword.isKeyword(40 /* Async */) && (positionDescription.tokenOrKeyword.parent.kind === 56 /* NestedFunctionDeclaration */ || positionDescription.tokenOrKeyword.parent.kind === 65 /* FunctionLiteral */ || positionDescription.tokenOrKeyword.parent.kind === 27 /* FunctionTypeDeclarationBody */)) {
|
|
3766
3760
|
kinds.add(12 /* Function */);
|
|
3767
3761
|
}
|
|
3768
|
-
return Query.from(kinds.values()).map(
|
|
3769
|
-
(k) => LocalizationHelper.localizeKeyword(k, this.locale, this.dialect).map((v) => new KeywordCompletionItemInfo(this.completionItemInfoContext, k, v))
|
|
3770
|
-
).flatMap((i) => i).toArray();
|
|
3762
|
+
return Query.from(kinds.values()).map((k) => LocalizationHelper.localizeKeyword(k, this.locale, this.dialect).map((v) => new KeywordCompletionItemInfo(this.completionItemInfoContext, k, v))).flatMap((i) => i).toArray();
|
|
3771
3763
|
}
|
|
3772
3764
|
isRepeatWhileKeywordContext(positionDescription) {
|
|
3773
3765
|
if (positionDescription.kind !== "after-token-or-keyword") {
|
|
@@ -3781,7 +3773,7 @@ var CompletionService = class {
|
|
|
3781
3773
|
return false;
|
|
3782
3774
|
}
|
|
3783
3775
|
const tokenOrKeyword = positionDescription.tokenOrKeyword;
|
|
3784
|
-
return tokenOrKeyword.isToken(45 /* OpenParenthesis */) && tokenOrKeyword.parent.kind ===
|
|
3776
|
+
return tokenOrKeyword.isToken(45 /* OpenParenthesis */) && tokenOrKeyword.parent.kind === 156 /* Modifier */;
|
|
3785
3777
|
}
|
|
3786
3778
|
isElseOrElseIfKeywordContext(positionDescription) {
|
|
3787
3779
|
if (positionDescription.kind !== "after-token-or-keyword") {
|
|
@@ -4053,12 +4045,10 @@ var CompletionService = class {
|
|
|
4053
4045
|
}
|
|
4054
4046
|
const isPrefix = ctx.precedingSegmentNames.length < n.segments.length && Query.zip(ctx.precedingSegmentNames, n.segments, (s1, s2) => s1.considerEqual(s2)).all((v) => v);
|
|
4055
4047
|
return isPrefix;
|
|
4056
|
-
}).map(
|
|
4057
|
-
|
|
4058
|
-
|
|
4059
|
-
|
|
4060
|
-
)
|
|
4061
|
-
);
|
|
4048
|
+
}).map((n) => new PackageNameSegmentCompletionItemInfo(
|
|
4049
|
+
this.completionItemInfoContext,
|
|
4050
|
+
n.segments[ctx.precedingSegmentNames.length]
|
|
4051
|
+
));
|
|
4062
4052
|
return result;
|
|
4063
4053
|
}
|
|
4064
4054
|
getTopLevelAliasListCompletionItemInfos(ctx) {
|
|
@@ -4150,9 +4140,7 @@ var CompletionService = class {
|
|
|
4150
4140
|
12 /* Function */
|
|
4151
4141
|
];
|
|
4152
4142
|
result = result.chain(
|
|
4153
|
-
Query.from(keywords).map(
|
|
4154
|
-
(k) => LocalizationHelper.localizeKeyword(k, ctx.sourceLocale, this.dialect).map((v) => new KeywordCompletionItemInfo(this.completionItemInfoContext, k, v))
|
|
4155
|
-
).flatMap((i) => i)
|
|
4143
|
+
Query.from(keywords).map((k) => LocalizationHelper.localizeKeyword(k, ctx.sourceLocale, this.dialect).map((v) => new KeywordCompletionItemInfo(this.completionItemInfoContext, k, v))).flatMap((i) => i)
|
|
4156
4144
|
);
|
|
4157
4145
|
}
|
|
4158
4146
|
return result.toArray();
|
|
@@ -4179,14 +4167,12 @@ var CompletionService = class {
|
|
|
4179
4167
|
return void 0;
|
|
4180
4168
|
});
|
|
4181
4169
|
} else if (ctx.translationKind === 3 /* Constructor */) {
|
|
4182
|
-
result = Query.from(ctx.typeEntity.getMembers().getConstructors()).map(
|
|
4183
|
-
|
|
4184
|
-
|
|
4185
|
-
|
|
4186
|
-
|
|
4187
|
-
|
|
4188
|
-
)
|
|
4189
|
-
);
|
|
4170
|
+
result = Query.from(ctx.typeEntity.getMembers().getConstructors()).map((c) => new AliasesSourceConstructorCompletionItemInfo(
|
|
4171
|
+
this.completionItemInfoContext,
|
|
4172
|
+
c,
|
|
4173
|
+
!ctx.hasPrecedingKeyword,
|
|
4174
|
+
displayService_
|
|
4175
|
+
));
|
|
4190
4176
|
} else if (ctx.translationKind === 2 /* Indexer */) {
|
|
4191
4177
|
result = Query.from(ctx.typeEntity.getMembers().getIndexers()).map((i) => new AliasesSourceIndexerCompletionItemInfo(this.completionItemInfoContext, i, displayService_));
|
|
4192
4178
|
} else if (ctx.translationKind === 0 /* Any */) {
|
|
@@ -4203,18 +4189,14 @@ var CompletionService = class {
|
|
|
4203
4189
|
}
|
|
4204
4190
|
return void 0;
|
|
4205
4191
|
}).chain(
|
|
4206
|
-
ctx.typeEntity.getMembers().getConstructors().map(
|
|
4207
|
-
|
|
4208
|
-
|
|
4209
|
-
|
|
4210
|
-
|
|
4211
|
-
|
|
4212
|
-
)
|
|
4213
|
-
)
|
|
4192
|
+
ctx.typeEntity.getMembers().getConstructors().map((c) => new AliasesSourceConstructorCompletionItemInfo(
|
|
4193
|
+
this.completionItemInfoContext,
|
|
4194
|
+
c,
|
|
4195
|
+
!ctx.hasPrecedingKeyword,
|
|
4196
|
+
displayService_
|
|
4197
|
+
))
|
|
4214
4198
|
).chain(
|
|
4215
|
-
ctx.typeEntity.getMembers().getIndexers().map(
|
|
4216
|
-
(i) => new AliasesSourceIndexerCompletionItemInfo(this.completionItemInfoContext, i, displayService_)
|
|
4217
|
-
)
|
|
4199
|
+
ctx.typeEntity.getMembers().getIndexers().map((i) => new AliasesSourceIndexerCompletionItemInfo(this.completionItemInfoContext, i, displayService_))
|
|
4218
4200
|
);
|
|
4219
4201
|
} else {
|
|
4220
4202
|
Debug.never(ctx.translationKind);
|
|
@@ -4226,9 +4208,7 @@ var CompletionService = class {
|
|
|
4226
4208
|
31 /* Creation */
|
|
4227
4209
|
];
|
|
4228
4210
|
result = result.chain(
|
|
4229
|
-
Query.from(keywords).map(
|
|
4230
|
-
(k) => LocalizationHelper.localizeKeyword(k, ctx.sourceLocale, this.dialect).map((v) => new KeywordCompletionItemInfo(this.completionItemInfoContext, k, v))
|
|
4231
|
-
).flatMap((i) => i)
|
|
4211
|
+
Query.from(keywords).map((k) => LocalizationHelper.localizeKeyword(k, ctx.sourceLocale, this.dialect).map((v) => new KeywordCompletionItemInfo(this.completionItemInfoContext, k, v))).flatMap((i) => i)
|
|
4232
4212
|
);
|
|
4233
4213
|
}
|
|
4234
4214
|
return result.toArray();
|
|
@@ -4267,13 +4247,11 @@ var CompletionService = class {
|
|
|
4267
4247
|
}
|
|
4268
4248
|
for (const functionInfo of functionInfoByLabel.values()) {
|
|
4269
4249
|
if (functionInfo.count > 1) {
|
|
4270
|
-
result.push(
|
|
4271
|
-
|
|
4272
|
-
|
|
4273
|
-
|
|
4274
|
-
|
|
4275
|
-
)
|
|
4276
|
-
);
|
|
4250
|
+
result.push(new MergedOverloadedFunctionCompletionItemInfo(
|
|
4251
|
+
this.completionItemInfoContext,
|
|
4252
|
+
functionInfo.itemInfo,
|
|
4253
|
+
functionInfo.count
|
|
4254
|
+
));
|
|
4277
4255
|
} else {
|
|
4278
4256
|
result.push(functionInfo.itemInfo);
|
|
4279
4257
|
}
|
|
@@ -4663,7 +4641,6 @@ var VariableEntityCompletionItemInfo = class {
|
|
|
4663
4641
|
case "field":
|
|
4664
4642
|
return this.entity.isVariant() ? 12 /* Variant */ : 2 /* Field */;
|
|
4665
4643
|
case "parameter":
|
|
4666
|
-
case "text-template-parameter":
|
|
4667
4644
|
return 10 /* Parameter */;
|
|
4668
4645
|
case "local":
|
|
4669
4646
|
return 9 /* LocalVariable */;
|
|
@@ -4868,7 +4845,6 @@ var AliasesSourceVariableCompletionItemInfo = class {
|
|
|
4868
4845
|
case "field":
|
|
4869
4846
|
return 2 /* Field */;
|
|
4870
4847
|
case "parameter":
|
|
4871
|
-
case "text-template-parameter":
|
|
4872
4848
|
return 10 /* Parameter */;
|
|
4873
4849
|
case "local":
|
|
4874
4850
|
return 9 /* LocalVariable */;
|
|
@@ -5187,7 +5163,7 @@ var SyntaxContextFactory = class {
|
|
|
5187
5163
|
if (positionDescription.kind === "after-token-or-keyword") {
|
|
5188
5164
|
isUnqualifiedTypeContext = this.isUnqualifiedTypeContext(positionDescription.tokenOrKeyword);
|
|
5189
5165
|
}
|
|
5190
|
-
const isUnqualifiedTagNameCompletionContext = positionDescription.kind === "after-token-or-keyword" && positionDescription.tokenOrKeyword.isToken(36 /* HashSign */) && positionDescription.tokenOrKeyword.parent.kind ===
|
|
5166
|
+
const isUnqualifiedTagNameCompletionContext = positionDescription.kind === "after-token-or-keyword" && positionDescription.tokenOrKeyword.isToken(36 /* HashSign */) && positionDescription.tokenOrKeyword.parent.kind === 154 /* Tag */;
|
|
5191
5167
|
let isTopLevelTranslationListContext;
|
|
5192
5168
|
if (positionDescription.kind === "after-token-or-keyword") {
|
|
5193
5169
|
isTopLevelTranslationListContext = this.isTopLevelTranslationListContext(positionDescription.tokenOrKeyword);
|
|
@@ -5229,15 +5205,15 @@ var SyntaxContextFactory = class {
|
|
|
5229
5205
|
const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.initializer);
|
|
5230
5206
|
return { isExpressionContext: { expressionRole }, isStatementContext: false };
|
|
5231
5207
|
}
|
|
5232
|
-
if (tokenOrKeyword.parent.kind ===
|
|
5208
|
+
if (tokenOrKeyword.parent.kind === 151 /* ParameterDeclaration */) {
|
|
5233
5209
|
const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.defaultValue);
|
|
5234
5210
|
return { isExpressionContext: { expressionRole }, isStatementContext: false };
|
|
5235
5211
|
}
|
|
5236
|
-
if (tokenOrKeyword.parent.kind ===
|
|
5212
|
+
if (tokenOrKeyword.parent.kind === 152 /* Argument */) {
|
|
5237
5213
|
const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.value);
|
|
5238
5214
|
return { isExpressionContext: { expressionRole }, isStatementContext: false };
|
|
5239
5215
|
}
|
|
5240
|
-
if (tokenOrKeyword.parent.kind ===
|
|
5216
|
+
if (tokenOrKeyword.parent.kind === 149 /* VariantDeclaration */) {
|
|
5241
5217
|
const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.value);
|
|
5242
5218
|
return { isExpressionContext: { expressionRole }, isStatementContext: false };
|
|
5243
5219
|
}
|
|
@@ -5254,7 +5230,7 @@ var SyntaxContextFactory = class {
|
|
|
5254
5230
|
const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.right);
|
|
5255
5231
|
return { isExpressionContext: { expressionRole }, isStatementContext: false };
|
|
5256
5232
|
}
|
|
5257
|
-
if (tokenOrKeyword.isToken(7 /* TextTemplateHead */) && tokenOrKeyword.parent.kind === 79 /* TextTemplateLiteral */) {
|
|
5233
|
+
if (tokenOrKeyword.isToken(7 /* TextTemplateHead */) && (tokenOrKeyword.parent.kind === 79 /* TextTemplateLiteral */ || tokenOrKeyword.parent.kind === 80 /* LocalizableTextTemplateLiteral */)) {
|
|
5258
5234
|
const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.spanList.spans.at(0)?.expression);
|
|
5259
5235
|
return { isExpressionContext: { expressionRole }, isStatementContext: false };
|
|
5260
5236
|
}
|
|
@@ -5307,7 +5283,7 @@ var SyntaxContextFactory = class {
|
|
|
5307
5283
|
const expressionRole = new ExpressionRole_argument(tokenOrKeyword.parent.argumentList, 0);
|
|
5308
5284
|
return { isExpressionContext: { expressionRole }, isStatementContext: false };
|
|
5309
5285
|
}
|
|
5310
|
-
if (tokenOrKeyword.parent.kind ===
|
|
5286
|
+
if (tokenOrKeyword.parent.kind === 154 /* Tag */) {
|
|
5311
5287
|
const argumentList = tokenOrKeyword.parent.argumentList;
|
|
5312
5288
|
if (argumentList !== void 0) {
|
|
5313
5289
|
const expressionRole = new ExpressionRole_argument(argumentList, 0);
|
|
@@ -5440,13 +5416,13 @@ var SyntaxContextFactory = class {
|
|
|
5440
5416
|
) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 35 /* PackageVariableSetterDeclaration */)) {
|
|
5441
5417
|
return true;
|
|
5442
5418
|
}
|
|
5443
|
-
if (tokenOrKeyword.isKeyword() && tokenOrKeyword.parent.kind ===
|
|
5419
|
+
if (tokenOrKeyword.isKeyword() && tokenOrKeyword.parent.kind === 156 /* Modifier */ && tokenOrKeyword.value === tokenOrKeyword.parent.value && tokenOrKeyword.parent.openParenthesisToken === void 0 && NodeTypeUtils.isPackageMemberDeclaration(tokenOrKeyword.parent.parent.parent)) {
|
|
5444
5420
|
return true;
|
|
5445
5421
|
}
|
|
5446
|
-
if (tokenOrKeyword.isToken(22 /* CloseParenthesis */) && tokenOrKeyword.parent.kind ===
|
|
5422
|
+
if (tokenOrKeyword.isToken(22 /* CloseParenthesis */) && tokenOrKeyword.parent.kind === 156 /* Modifier */ && NodeTypeUtils.isPackageMemberDeclaration(tokenOrKeyword.parent.parent.parent)) {
|
|
5447
5423
|
return true;
|
|
5448
5424
|
}
|
|
5449
|
-
const tag = SyntaxContextUtils.ifTokenIsValidEndOfNodeThenNode(tokenOrKeyword,
|
|
5425
|
+
const tag = SyntaxContextUtils.ifTokenIsValidEndOfNodeThenNode(tokenOrKeyword, 154 /* Tag */);
|
|
5450
5426
|
if (tag !== void 0 && NodeTypeUtils.isPackageMemberDeclaration(tag.parent.parent)) {
|
|
5451
5427
|
return true;
|
|
5452
5428
|
}
|
|
@@ -5474,16 +5450,16 @@ var SyntaxContextFactory = class {
|
|
|
5474
5450
|
) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(
|
|
5475
5451
|
tokenOrKeyword,
|
|
5476
5452
|
49 /* DereferencedVariableSetterDeclaration */
|
|
5477
|
-
) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 50 /* MethodDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 51 /* OperatorDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 43 /* ConstructorDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 44 /* DestructorDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword,
|
|
5453
|
+
) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 50 /* MethodDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 51 /* OperatorDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 43 /* ConstructorDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 44 /* DestructorDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 149 /* VariantDeclaration */)) {
|
|
5478
5454
|
return true;
|
|
5479
5455
|
}
|
|
5480
|
-
if (tokenOrKeyword.isKeyword() && tokenOrKeyword.parent.kind ===
|
|
5456
|
+
if (tokenOrKeyword.isKeyword() && tokenOrKeyword.parent.kind === 156 /* Modifier */ && tokenOrKeyword.value === tokenOrKeyword.parent.value && tokenOrKeyword.parent.openParenthesisToken === void 0 && NodeTypeUtils.isTypeMemberDeclaration(tokenOrKeyword.parent.parent.parent)) {
|
|
5481
5457
|
return true;
|
|
5482
5458
|
}
|
|
5483
|
-
if (tokenOrKeyword.isToken(22 /* CloseParenthesis */) && tokenOrKeyword.parent.kind ===
|
|
5459
|
+
if (tokenOrKeyword.isToken(22 /* CloseParenthesis */) && tokenOrKeyword.parent.kind === 156 /* Modifier */ && NodeTypeUtils.isTypeMemberDeclaration(tokenOrKeyword.parent.parent.parent)) {
|
|
5484
5460
|
return true;
|
|
5485
5461
|
}
|
|
5486
|
-
const tag = SyntaxContextUtils.ifTokenIsValidEndOfNodeThenNode(tokenOrKeyword,
|
|
5462
|
+
const tag = SyntaxContextUtils.ifTokenIsValidEndOfNodeThenNode(tokenOrKeyword, 154 /* Tag */);
|
|
5487
5463
|
if (tag !== void 0 && NodeTypeUtils.isTypeMemberDeclaration(tag.parent.parent)) {
|
|
5488
5464
|
return true;
|
|
5489
5465
|
}
|
|
@@ -5521,7 +5497,7 @@ var SyntaxContextFactory = class {
|
|
|
5521
5497
|
return result;
|
|
5522
5498
|
}
|
|
5523
5499
|
static isUnqualifiedTypeContext(tokenOrKeyword) {
|
|
5524
|
-
if (tokenOrKeyword.isToken(24 /* Colon */) && tokenOrKeyword.parent.kind ===
|
|
5500
|
+
if (tokenOrKeyword.isToken(24 /* Colon */) && tokenOrKeyword.parent.kind === 163 /* TypeAnnotation */) {
|
|
5525
5501
|
return { allowsAnonymousTypes: true };
|
|
5526
5502
|
}
|
|
5527
5503
|
if ((tokenOrKeyword.isKeyword(4 /* Object */) || tokenOrKeyword.isKeyword(5 /* PlainObject */) || tokenOrKeyword.isKeyword(3 /* Aspect */)) && tokenOrKeyword.parent.kind === 32 /* StructuredTypeDeclarationBody */) {
|
|
@@ -5530,16 +5506,16 @@ var SyntaxContextFactory = class {
|
|
|
5530
5506
|
if (tokenOrKeyword.isKeyword(16 /* Type */) && (NodeTypeUtils.isPackageTypeDeclaration(tokenOrKeyword.parent) || tokenOrKeyword.parent.kind === 38 /* TypeExtensionDeclaration */)) {
|
|
5531
5507
|
return { allowsAnonymousTypes: false };
|
|
5532
5508
|
}
|
|
5533
|
-
if (tokenOrKeyword.isToken(37 /* LessThan */) && tokenOrKeyword.parent.kind ===
|
|
5509
|
+
if (tokenOrKeyword.isToken(37 /* LessThan */) && tokenOrKeyword.parent.kind === 159 /* TypeArgumentClause */) {
|
|
5534
5510
|
return { allowsAnonymousTypes: true };
|
|
5535
5511
|
}
|
|
5536
|
-
if (tokenOrKeyword.isToken(25 /* Comma */) && (tokenOrKeyword.parent.kind === 28 /* BaseTypeList */ || tokenOrKeyword.parent.kind ===
|
|
5537
|
-
return { allowsAnonymousTypes: tokenOrKeyword.parent.kind ===
|
|
5512
|
+
if (tokenOrKeyword.isToken(25 /* Comma */) && (tokenOrKeyword.parent.kind === 28 /* BaseTypeList */ || tokenOrKeyword.parent.kind === 160 /* TypeArgumentList */)) {
|
|
5513
|
+
return { allowsAnonymousTypes: tokenOrKeyword.parent.kind === 160 /* TypeArgumentList */ };
|
|
5538
5514
|
}
|
|
5539
|
-
if (tokenOrKeyword.isToken(36 /* HashSign */) && tokenOrKeyword.parent.kind ===
|
|
5515
|
+
if (tokenOrKeyword.isToken(36 /* HashSign */) && tokenOrKeyword.parent.kind === 154 /* Tag */) {
|
|
5540
5516
|
return { allowsAnonymousTypes: false };
|
|
5541
5517
|
}
|
|
5542
|
-
if ((tokenOrKeyword.isToken(24 /* Colon */) || tokenOrKeyword.isToken(58 /* Equals */)) && tokenOrKeyword.parent.kind ===
|
|
5518
|
+
if ((tokenOrKeyword.isToken(24 /* Colon */) || tokenOrKeyword.isToken(58 /* Equals */)) && tokenOrKeyword.parent.kind === 150 /* TypeParameterDeclaration */) {
|
|
5543
5519
|
return { allowsAnonymousTypes: false };
|
|
5544
5520
|
}
|
|
5545
5521
|
if (tokenOrKeyword.isToken(58 /* Equals */) && tokenOrKeyword.parent.kind === 20 /* PackageAliasTypeDeclaration */) {
|
|
@@ -5762,6 +5738,10 @@ var NodeSemanticInfoService = class {
|
|
|
5762
5738
|
return this.ofConstructorDeclaration(analyzer, tokenOrKeyword.parent);
|
|
5763
5739
|
} else if (tokenOrKeyword.isToken(14 /* Asterisk */) && tokenOrKeyword.parent.kind === 91 /* DefaultMatchExpression */) {
|
|
5764
5740
|
return this.ofDefaultMatchExpression(analyzer, tokenOrKeyword.parent);
|
|
5741
|
+
} else if (tokenOrKeyword.isKeyword(12 /* Function */) && tokenOrKeyword.parent.kind === 65 /* FunctionLiteral */) {
|
|
5742
|
+
return this.ofRegularOrBlockFunctionLiteral(analyzer, tokenOrKeyword.parent);
|
|
5743
|
+
} else if (tokenOrKeyword.isToken(44 /* OpenBrace */) && tokenOrKeyword.parent.kind === 95 /* FunctionBlock */ && tokenOrKeyword.parent.parent.kind === 66 /* FunctionBlockLiteral */) {
|
|
5744
|
+
return this.ofRegularOrBlockFunctionLiteral(analyzer, tokenOrKeyword.parent.parent);
|
|
5765
5745
|
} else if (tokenOrKeyword.isKeyword(4 /* Object */) && tokenOrKeyword.parent.kind === 87 /* ObjectExpression */) {
|
|
5766
5746
|
return this.ofObjectExpression(analyzer, tokenOrKeyword.parent, options6);
|
|
5767
5747
|
} else if (tokenOrKeyword.isKeyword(56 /* Base */) && tokenOrKeyword.parent.kind === 88 /* BaseExpression */) {
|
|
@@ -5773,6 +5753,10 @@ var NodeSemanticInfoService = class {
|
|
|
5773
5753
|
}
|
|
5774
5754
|
return void 0;
|
|
5775
5755
|
}
|
|
5756
|
+
static ofRegularOrBlockFunctionLiteral(analyzer, node) {
|
|
5757
|
+
const type = analyzer.type.ofRegularOrBlockFunctionLiteral(node);
|
|
5758
|
+
return new RegularOrBlockFunctionLiteralNodeSemanticInfo(type);
|
|
5759
|
+
}
|
|
5776
5760
|
static ofDefaultMatchExpression(analyzer, node) {
|
|
5777
5761
|
const type = analyzer.type.ofExpression(node);
|
|
5778
5762
|
return new DefaultSwitchMatchNodeSemanticInfo(type);
|
|
@@ -5785,7 +5769,7 @@ var NodeSemanticInfoService = class {
|
|
|
5785
5769
|
break;
|
|
5786
5770
|
case 126 /* TranslationParameterList */:
|
|
5787
5771
|
break;
|
|
5788
|
-
case
|
|
5772
|
+
case 152 /* Argument */: {
|
|
5789
5773
|
const respectiveParameter = analyzer.getRespectiveParameter(parent);
|
|
5790
5774
|
if (respectiveParameter !== void 0) {
|
|
5791
5775
|
const target = new MatchResultParameterReferenceTarget(respectiveParameter, 0 /* Get */);
|
|
@@ -5961,7 +5945,7 @@ var NodeSemanticInfoService = class {
|
|
|
5961
5945
|
}
|
|
5962
5946
|
break;
|
|
5963
5947
|
}
|
|
5964
|
-
case
|
|
5948
|
+
case 151 /* ParameterDeclaration */:
|
|
5965
5949
|
result = new DefinitionNodeSemanticInfo(analyzer.entity.ofParameterDeclaration(parent));
|
|
5966
5950
|
break;
|
|
5967
5951
|
case 8 /* PackageImport */:
|
|
@@ -5982,10 +5966,10 @@ var NodeSemanticInfoService = class {
|
|
|
5982
5966
|
case 52 /* FieldDeclaration */:
|
|
5983
5967
|
result = new DefinitionNodeSemanticInfo(analyzer.entity.ofFieldDeclaration(parent));
|
|
5984
5968
|
break;
|
|
5985
|
-
case
|
|
5969
|
+
case 150 /* TypeParameterDeclaration */:
|
|
5986
5970
|
result = new DefinitionNodeSemanticInfo(analyzer.entity.ofTypeParameterDeclaration(parent));
|
|
5987
5971
|
break;
|
|
5988
|
-
case
|
|
5972
|
+
case 149 /* VariantDeclaration */:
|
|
5989
5973
|
result = new DefinitionNodeSemanticInfo(analyzer.entity.ofVariantDeclaration(parent));
|
|
5990
5974
|
break;
|
|
5991
5975
|
case 34 /* PackageVariableGetterDeclaration */:
|
|
@@ -5996,6 +5980,9 @@ var NodeSemanticInfoService = class {
|
|
|
5996
5980
|
case 54 /* FieldSetterDeclaration */:
|
|
5997
5981
|
result = new DefinitionNodeSemanticInfo(analyzer.entity.ofComputedFieldDeclaration(parent));
|
|
5998
5982
|
break;
|
|
5983
|
+
case 148 /* TranslationTextTemplateParameter */:
|
|
5984
|
+
result = new DefinitionNodeSemanticInfo(analyzer.entity.ofTranslationTextTemplateParameter(parent));
|
|
5985
|
+
break;
|
|
5999
5986
|
case 3 /* Keyword */:
|
|
6000
5987
|
break;
|
|
6001
5988
|
default:
|
|
@@ -6142,7 +6129,7 @@ var NodeSemanticInfoService = class {
|
|
|
6142
6129
|
switch (node.parent.kind) {
|
|
6143
6130
|
case 10 /* NamedTypeSpecifier */:
|
|
6144
6131
|
return this.ofNamedTypeSpecifierNameQualifier(analyzer, node.parent, qualifier, options6);
|
|
6145
|
-
case
|
|
6132
|
+
case 154 /* Tag */:
|
|
6146
6133
|
return this.ofTagNameQualifier(analyzer, node.parent, qualifier, options6);
|
|
6147
6134
|
case 40 /* ExtendedTypeClause */:
|
|
6148
6135
|
case 136 /* PackageImportTranslationDeclaration */:
|
|
@@ -6642,11 +6629,6 @@ var NodeSemanticInfoService = class {
|
|
|
6642
6629
|
specialVariableInfo.targetTypeParameter,
|
|
6643
6630
|
currentTarget.accessKind
|
|
6644
6631
|
);
|
|
6645
|
-
} else if (specialVariableInfo?.kind === "text-template-function-type-parameter") {
|
|
6646
|
-
betterTarget = new EntityReferenceTarget(
|
|
6647
|
-
specialVariableInfo.textTemplateParameter,
|
|
6648
|
-
currentTarget.accessKind
|
|
6649
|
-
);
|
|
6650
6632
|
}
|
|
6651
6633
|
}
|
|
6652
6634
|
}
|
|
@@ -6814,6 +6796,12 @@ var DefaultSwitchMatchNodeSemanticInfo = class {
|
|
|
6814
6796
|
this.kind = "default-switch-match";
|
|
6815
6797
|
}
|
|
6816
6798
|
};
|
|
6799
|
+
var RegularOrBlockFunctionLiteralNodeSemanticInfo = class {
|
|
6800
|
+
constructor(type) {
|
|
6801
|
+
this.type = type;
|
|
6802
|
+
this.kind = "regular-or-block-function-literal";
|
|
6803
|
+
}
|
|
6804
|
+
};
|
|
6817
6805
|
|
|
6818
6806
|
// source/services/Utils.ts
|
|
6819
6807
|
function getEntitySourceLocations(analyzer, entity) {
|
|
@@ -6856,14 +6844,12 @@ function getEntitySourceLocations(analyzer, entity) {
|
|
|
6856
6844
|
return new SourceLocation(sourceFile, range);
|
|
6857
6845
|
});
|
|
6858
6846
|
}
|
|
6859
|
-
} else if (entity.kind === 13 /*
|
|
6847
|
+
} else if (entity.kind === 13 /* TextTranslation */) {
|
|
6860
6848
|
const definition = entity.getDefinition();
|
|
6861
6849
|
if (definition.kind === 0 /* Source */) {
|
|
6862
|
-
|
|
6863
|
-
|
|
6864
|
-
|
|
6865
|
-
return new SourceLocation(sourceFile, range);
|
|
6866
|
-
});
|
|
6850
|
+
const range = definition.node.rangeWithoutTrivia;
|
|
6851
|
+
const sourceFile = TreeQuery.getSourceFile(definition.node, analyzer);
|
|
6852
|
+
return [new SourceLocation(sourceFile, range)];
|
|
6867
6853
|
}
|
|
6868
6854
|
} else {
|
|
6869
6855
|
const definition = entity.getDefinition();
|
|
@@ -6883,7 +6869,7 @@ function getEntitySourceLocations(analyzer, entity) {
|
|
|
6883
6869
|
case 36 /* PackageVariantTypeDeclaration */:
|
|
6884
6870
|
case 56 /* NestedFunctionDeclaration */:
|
|
6885
6871
|
case 50 /* MethodDeclaration */:
|
|
6886
|
-
case
|
|
6872
|
+
case 150 /* TypeParameterDeclaration */:
|
|
6887
6873
|
case 51 /* OperatorDeclaration */:
|
|
6888
6874
|
range = node.name.rangeWithoutTrivia;
|
|
6889
6875
|
break;
|
|
@@ -6985,6 +6971,8 @@ var DefinitionService = class {
|
|
|
6985
6971
|
}
|
|
6986
6972
|
case "default-switch-match":
|
|
6987
6973
|
break;
|
|
6974
|
+
case "regular-or-block-function-literal":
|
|
6975
|
+
break;
|
|
6988
6976
|
default:
|
|
6989
6977
|
Debug.never(semanticInfo);
|
|
6990
6978
|
}
|
|
@@ -7111,8 +7099,6 @@ var DefinitionService = class {
|
|
|
7111
7099
|
return [this.getSourceLocationOfSubprogramNode(analyzer, info.setterDeclaration)];
|
|
7112
7100
|
case "implicit-function-block-parameter":
|
|
7113
7101
|
return [this.getSourceLocationOfSubprogramNode(analyzer, info.functionBlockLiteral)];
|
|
7114
|
-
case "text-template-function-type-parameter":
|
|
7115
|
-
return getEntitySourceLocations(analyzer, info.textTemplateParameter);
|
|
7116
7102
|
case "backing":
|
|
7117
7103
|
return getEntitySourceLocations(analyzer, info.computedVariable);
|
|
7118
7104
|
default:
|
|
@@ -7163,6 +7149,9 @@ var DefinitionService = class {
|
|
|
7163
7149
|
range = new Range(rangeStart, rangeEnd);
|
|
7164
7150
|
break;
|
|
7165
7151
|
}
|
|
7152
|
+
case 143 /* TextTranslationFunctionDeclaration */:
|
|
7153
|
+
range = node.sourceText.rangeWithoutTrivia;
|
|
7154
|
+
break;
|
|
7166
7155
|
default:
|
|
7167
7156
|
Debug.never(node);
|
|
7168
7157
|
}
|
|
@@ -7436,6 +7425,8 @@ var ReferencesService = class {
|
|
|
7436
7425
|
return getDefinitionOfReference(info);
|
|
7437
7426
|
case "default-switch-match":
|
|
7438
7427
|
return [];
|
|
7428
|
+
case "regular-or-block-function-literal":
|
|
7429
|
+
return [];
|
|
7439
7430
|
default:
|
|
7440
7431
|
Debug.never(info);
|
|
7441
7432
|
}
|
|
@@ -7640,7 +7631,7 @@ var ReferencesService = class {
|
|
|
7640
7631
|
case 12 /* Package */:
|
|
7641
7632
|
case 11 /* TypeExtension */:
|
|
7642
7633
|
case 9 /* Operator */:
|
|
7643
|
-
case 13 /*
|
|
7634
|
+
case 13 /* TextTranslation */:
|
|
7644
7635
|
return void 0;
|
|
7645
7636
|
default:
|
|
7646
7637
|
Debug.never(entity);
|
|
@@ -7736,7 +7727,39 @@ var EvaluatableExpressionService = class {
|
|
|
7736
7727
|
convertEvaluatableExpressionToString(analyzer, node) {
|
|
7737
7728
|
let result = "";
|
|
7738
7729
|
if (isIdentifier(node)) {
|
|
7739
|
-
|
|
7730
|
+
let originalName;
|
|
7731
|
+
if (node.parent.kind === 76 /* MemberAccessExpression */) {
|
|
7732
|
+
const meaning = analyzer.resolveMemberAccessExpression(node.parent).meaning;
|
|
7733
|
+
let entity;
|
|
7734
|
+
switch (meaning.kind) {
|
|
7735
|
+
case "static-field-access":
|
|
7736
|
+
entity = meaning.field.getEntity();
|
|
7737
|
+
break;
|
|
7738
|
+
case "static-method-access":
|
|
7739
|
+
entity = meaning.singleFunction?.getEntity();
|
|
7740
|
+
break;
|
|
7741
|
+
case "instance-field-access":
|
|
7742
|
+
entity = meaning.field.getEntity();
|
|
7743
|
+
break;
|
|
7744
|
+
case "instance-method-access":
|
|
7745
|
+
entity = meaning.singleFunction?.getEntity();
|
|
7746
|
+
break;
|
|
7747
|
+
}
|
|
7748
|
+
originalName = entity?.getOriginalEntity().getName().keyWithoutBackQuotes;
|
|
7749
|
+
} else if (node.parent.kind === 89 /* IdentifierExpression */) {
|
|
7750
|
+
const meaning = analyzer.resolveIdentifierExpression(node.parent).meaning;
|
|
7751
|
+
let entity;
|
|
7752
|
+
switch (meaning.kind) {
|
|
7753
|
+
case "variable-access":
|
|
7754
|
+
entity = meaning.variable.getEntity();
|
|
7755
|
+
break;
|
|
7756
|
+
case "function-access":
|
|
7757
|
+
entity = meaning.singleFunction?.getEntity();
|
|
7758
|
+
break;
|
|
7759
|
+
}
|
|
7760
|
+
originalName = entity?.getOriginalEntity().getName().keyWithoutBackQuotes;
|
|
7761
|
+
}
|
|
7762
|
+
result = originalName ?? kebabCaseToCamelCase(node.value);
|
|
7740
7763
|
} else if (node.kind === 0 /* Token */) {
|
|
7741
7764
|
result += node.value;
|
|
7742
7765
|
} else {
|
|
@@ -7802,15 +7825,15 @@ var EvaluatableExpressionService = class {
|
|
|
7802
7825
|
return { nameIdentifier: node.name };
|
|
7803
7826
|
case 57 /* LocalVariableDeclaration */:
|
|
7804
7827
|
return { nameIdentifier: node.name };
|
|
7805
|
-
case
|
|
7828
|
+
case 151 /* ParameterDeclaration */:
|
|
7806
7829
|
return { nameIdentifier: node.name };
|
|
7807
7830
|
case 50 /* MethodDeclaration */:
|
|
7808
7831
|
return { nameIdentifier: node.name };
|
|
7809
7832
|
case 52 /* FieldDeclaration */:
|
|
7810
7833
|
return { nameIdentifier: node.name };
|
|
7811
|
-
case
|
|
7834
|
+
case 150 /* TypeParameterDeclaration */:
|
|
7812
7835
|
return { nameIdentifier: node.name };
|
|
7813
|
-
case
|
|
7836
|
+
case 149 /* VariantDeclaration */:
|
|
7814
7837
|
return { nameIdentifier: node.name };
|
|
7815
7838
|
case 102 /* ErrorVariableDeclaration */:
|
|
7816
7839
|
return { nameIdentifier: node.name };
|
|
@@ -7869,7 +7892,7 @@ var HoverService = class {
|
|
|
7869
7892
|
return 2;
|
|
7870
7893
|
} else if (t.isToken(14 /* Asterisk */)) {
|
|
7871
7894
|
return 1;
|
|
7872
|
-
} else if (t.isToken(20 /* Caret */) || t.isToken(46 /* OpenSquareBracket */) || t.isToken(23 /* CloseSquareBracket */)) {
|
|
7895
|
+
} else if (t.isToken(20 /* Caret */) || t.isToken(46 /* OpenSquareBracket */) || t.isToken(23 /* CloseSquareBracket */) || t.isToken(44 /* OpenBrace */)) {
|
|
7873
7896
|
return 1;
|
|
7874
7897
|
} else {
|
|
7875
7898
|
return 0;
|
|
@@ -7902,6 +7925,8 @@ var HoverService = class {
|
|
|
7902
7925
|
`*: ${this.displayService.displayType(semanticInfo.type)}`,
|
|
7903
7926
|
tokenOrKeyword.value.rangeWithoutTrivia
|
|
7904
7927
|
);
|
|
7928
|
+
case "regular-or-block-function-literal":
|
|
7929
|
+
return new Hover(this.displayService.displayType(semanticInfo.type), tokenOrKeyword.value.rangeWithoutTrivia);
|
|
7905
7930
|
default:
|
|
7906
7931
|
Debug.never(semanticInfo);
|
|
7907
7932
|
}
|
|
@@ -8024,136 +8049,114 @@ var SourceFileItemsService = class {
|
|
|
8024
8049
|
switch (node2.kind) {
|
|
8025
8050
|
case 8 /* PackageImport */: {
|
|
8026
8051
|
if (node2.alias !== void 0) {
|
|
8027
|
-
result.push(
|
|
8028
|
-
|
|
8029
|
-
|
|
8030
|
-
|
|
8031
|
-
|
|
8032
|
-
|
|
8033
|
-
|
|
8034
|
-
)
|
|
8035
|
-
);
|
|
8052
|
+
result.push(this.createItem(
|
|
8053
|
+
0 /* PackageAlias */,
|
|
8054
|
+
node2.alias.value,
|
|
8055
|
+
node2.rangeWithoutTrivia,
|
|
8056
|
+
node2.alias.rangeWithoutTrivia,
|
|
8057
|
+
items
|
|
8058
|
+
));
|
|
8036
8059
|
}
|
|
8037
8060
|
break;
|
|
8038
8061
|
}
|
|
8039
8062
|
case 33 /* PackageVariableDeclaration */: {
|
|
8040
|
-
result.push(
|
|
8041
|
-
|
|
8042
|
-
|
|
8043
|
-
|
|
8044
|
-
|
|
8045
|
-
|
|
8046
|
-
|
|
8047
|
-
)
|
|
8048
|
-
);
|
|
8063
|
+
result.push(this.createItem(
|
|
8064
|
+
1 /* PackageVariable */,
|
|
8065
|
+
node2.name.value,
|
|
8066
|
+
node2.rangeWithoutTrivia,
|
|
8067
|
+
node2.name.rangeWithoutTrivia,
|
|
8068
|
+
items
|
|
8069
|
+
));
|
|
8049
8070
|
break;
|
|
8050
8071
|
}
|
|
8051
8072
|
case 34 /* PackageVariableGetterDeclaration */: {
|
|
8052
|
-
result.push(
|
|
8053
|
-
|
|
8054
|
-
|
|
8055
|
-
|
|
8056
|
-
|
|
8057
|
-
|
|
8058
|
-
|
|
8059
|
-
)
|
|
8060
|
-
);
|
|
8073
|
+
result.push(this.createItem(
|
|
8074
|
+
2 /* PackageVariableGetter */,
|
|
8075
|
+
node2.name.value,
|
|
8076
|
+
node2.rangeWithoutTrivia,
|
|
8077
|
+
node2.name.rangeWithoutTrivia,
|
|
8078
|
+
items
|
|
8079
|
+
));
|
|
8061
8080
|
break;
|
|
8062
8081
|
}
|
|
8063
8082
|
case 35 /* PackageVariableSetterDeclaration */: {
|
|
8064
|
-
result.push(
|
|
8065
|
-
|
|
8066
|
-
|
|
8067
|
-
|
|
8068
|
-
|
|
8069
|
-
|
|
8070
|
-
|
|
8071
|
-
)
|
|
8072
|
-
);
|
|
8083
|
+
result.push(this.createItem(
|
|
8084
|
+
3 /* PackageVariableSetter */,
|
|
8085
|
+
node2.name.value,
|
|
8086
|
+
node2.rangeWithoutTrivia,
|
|
8087
|
+
node2.name.rangeWithoutTrivia,
|
|
8088
|
+
items
|
|
8089
|
+
));
|
|
8073
8090
|
break;
|
|
8074
8091
|
}
|
|
8075
8092
|
case 25 /* PackageFunctionDeclaration */: {
|
|
8076
|
-
result.push(
|
|
8077
|
-
|
|
8078
|
-
|
|
8079
|
-
|
|
8080
|
-
|
|
8081
|
-
|
|
8082
|
-
|
|
8083
|
-
)
|
|
8084
|
-
);
|
|
8093
|
+
result.push(this.createItem(
|
|
8094
|
+
4 /* PackageFunction */,
|
|
8095
|
+
node2.name.value,
|
|
8096
|
+
node2.rangeWithoutTrivia,
|
|
8097
|
+
node2.name.rangeWithoutTrivia,
|
|
8098
|
+
items
|
|
8099
|
+
));
|
|
8085
8100
|
break;
|
|
8086
8101
|
}
|
|
8087
8102
|
case 31 /* PackageStructuredTypeDeclaration */: {
|
|
8088
|
-
result.push(
|
|
8089
|
-
|
|
8090
|
-
|
|
8091
|
-
|
|
8092
|
-
|
|
8093
|
-
|
|
8094
|
-
|
|
8095
|
-
)
|
|
8096
|
-
);
|
|
8103
|
+
result.push(this.createItem(
|
|
8104
|
+
5 /* StructuredType */,
|
|
8105
|
+
node2.name.value,
|
|
8106
|
+
node2.rangeWithoutTrivia,
|
|
8107
|
+
node2.name.rangeWithoutTrivia,
|
|
8108
|
+
items
|
|
8109
|
+
));
|
|
8097
8110
|
break;
|
|
8098
8111
|
}
|
|
8099
8112
|
case 52 /* FieldDeclaration */: {
|
|
8100
|
-
result.push(
|
|
8101
|
-
|
|
8102
|
-
|
|
8103
|
-
|
|
8104
|
-
|
|
8105
|
-
|
|
8106
|
-
|
|
8107
|
-
)
|
|
8108
|
-
);
|
|
8113
|
+
result.push(this.createItem(
|
|
8114
|
+
12 /* Field */,
|
|
8115
|
+
node2.name.value,
|
|
8116
|
+
node2.rangeWithoutTrivia,
|
|
8117
|
+
node2.name.rangeWithoutTrivia,
|
|
8118
|
+
items
|
|
8119
|
+
));
|
|
8109
8120
|
break;
|
|
8110
8121
|
}
|
|
8111
8122
|
case 53 /* FieldGetterDeclaration */: {
|
|
8112
|
-
result.push(
|
|
8113
|
-
|
|
8114
|
-
|
|
8115
|
-
|
|
8116
|
-
|
|
8117
|
-
|
|
8118
|
-
|
|
8119
|
-
)
|
|
8120
|
-
);
|
|
8123
|
+
result.push(this.createItem(
|
|
8124
|
+
13 /* FieldGetter */,
|
|
8125
|
+
node2.name.value,
|
|
8126
|
+
node2.rangeWithoutTrivia,
|
|
8127
|
+
node2.name.rangeWithoutTrivia,
|
|
8128
|
+
items
|
|
8129
|
+
));
|
|
8121
8130
|
break;
|
|
8122
8131
|
}
|
|
8123
8132
|
case 54 /* FieldSetterDeclaration */: {
|
|
8124
|
-
result.push(
|
|
8125
|
-
|
|
8126
|
-
|
|
8127
|
-
|
|
8128
|
-
|
|
8129
|
-
|
|
8130
|
-
|
|
8131
|
-
)
|
|
8132
|
-
);
|
|
8133
|
+
result.push(this.createItem(
|
|
8134
|
+
14 /* FieldSetter */,
|
|
8135
|
+
node2.name.value,
|
|
8136
|
+
node2.rangeWithoutTrivia,
|
|
8137
|
+
node2.name.rangeWithoutTrivia,
|
|
8138
|
+
items
|
|
8139
|
+
));
|
|
8133
8140
|
break;
|
|
8134
8141
|
}
|
|
8135
8142
|
case 50 /* MethodDeclaration */: {
|
|
8136
|
-
result.push(
|
|
8137
|
-
|
|
8138
|
-
|
|
8139
|
-
|
|
8140
|
-
|
|
8141
|
-
|
|
8142
|
-
|
|
8143
|
-
)
|
|
8144
|
-
);
|
|
8143
|
+
result.push(this.createItem(
|
|
8144
|
+
15 /* Method */,
|
|
8145
|
+
node2.name.value,
|
|
8146
|
+
node2.rangeWithoutTrivia,
|
|
8147
|
+
node2.name.rangeWithoutTrivia,
|
|
8148
|
+
items
|
|
8149
|
+
));
|
|
8145
8150
|
break;
|
|
8146
8151
|
}
|
|
8147
8152
|
case 43 /* ConstructorDeclaration */: {
|
|
8148
|
-
result.push(
|
|
8149
|
-
|
|
8150
|
-
|
|
8151
|
-
|
|
8152
|
-
|
|
8153
|
-
|
|
8154
|
-
|
|
8155
|
-
)
|
|
8156
|
-
);
|
|
8153
|
+
result.push(this.createItem(
|
|
8154
|
+
10 /* Constructor */,
|
|
8155
|
+
void 0,
|
|
8156
|
+
node2.rangeWithoutTrivia,
|
|
8157
|
+
node2.rangeWithoutTrivia,
|
|
8158
|
+
items
|
|
8159
|
+
));
|
|
8157
8160
|
break;
|
|
8158
8161
|
}
|
|
8159
8162
|
case 44 /* DestructorDeclaration */: {
|
|
@@ -8167,87 +8170,73 @@ var SourceFileItemsService = class {
|
|
|
8167
8170
|
break;
|
|
8168
8171
|
}
|
|
8169
8172
|
case 45 /* IndexedElementGetterDeclaration */: {
|
|
8170
|
-
result.push(
|
|
8171
|
-
|
|
8172
|
-
|
|
8173
|
-
|
|
8174
|
-
|
|
8175
|
-
|
|
8176
|
-
|
|
8177
|
-
)
|
|
8178
|
-
);
|
|
8173
|
+
result.push(this.createItem(
|
|
8174
|
+
16 /* IndexedElementGetter */,
|
|
8175
|
+
void 0,
|
|
8176
|
+
node2.rangeWithoutTrivia,
|
|
8177
|
+
node2.rangeWithoutTrivia,
|
|
8178
|
+
items
|
|
8179
|
+
));
|
|
8179
8180
|
break;
|
|
8180
8181
|
}
|
|
8181
8182
|
case 46 /* IndexedElementSetterDeclaration */: {
|
|
8182
|
-
result.push(
|
|
8183
|
-
|
|
8184
|
-
|
|
8185
|
-
|
|
8186
|
-
|
|
8187
|
-
|
|
8188
|
-
|
|
8189
|
-
)
|
|
8190
|
-
);
|
|
8183
|
+
result.push(this.createItem(
|
|
8184
|
+
17 /* IndexedElementSetter */,
|
|
8185
|
+
void 0,
|
|
8186
|
+
node2.rangeWithoutTrivia,
|
|
8187
|
+
node2.rangeWithoutTrivia,
|
|
8188
|
+
items
|
|
8189
|
+
));
|
|
8191
8190
|
break;
|
|
8192
8191
|
}
|
|
8193
8192
|
case 26 /* PackageFunctionTypeDeclaration */: {
|
|
8194
|
-
result.push(
|
|
8195
|
-
|
|
8196
|
-
|
|
8197
|
-
|
|
8198
|
-
|
|
8199
|
-
|
|
8200
|
-
|
|
8201
|
-
)
|
|
8202
|
-
);
|
|
8193
|
+
result.push(this.createItem(
|
|
8194
|
+
6 /* FunctionType */,
|
|
8195
|
+
node2.name.value,
|
|
8196
|
+
node2.rangeWithoutTrivia,
|
|
8197
|
+
node2.name.rangeWithoutTrivia,
|
|
8198
|
+
items
|
|
8199
|
+
));
|
|
8203
8200
|
break;
|
|
8204
8201
|
}
|
|
8205
8202
|
case 36 /* PackageVariantTypeDeclaration */: {
|
|
8206
|
-
result.push(
|
|
8207
|
-
|
|
8208
|
-
|
|
8209
|
-
|
|
8210
|
-
|
|
8211
|
-
|
|
8212
|
-
|
|
8213
|
-
)
|
|
8214
|
-
);
|
|
8203
|
+
result.push(this.createItem(
|
|
8204
|
+
7 /* VariantType */,
|
|
8205
|
+
node2.name.value,
|
|
8206
|
+
node2.rangeWithoutTrivia,
|
|
8207
|
+
node2.name.rangeWithoutTrivia,
|
|
8208
|
+
items
|
|
8209
|
+
));
|
|
8215
8210
|
break;
|
|
8216
8211
|
}
|
|
8217
|
-
case
|
|
8218
|
-
result.push(
|
|
8219
|
-
|
|
8220
|
-
|
|
8221
|
-
|
|
8222
|
-
|
|
8223
|
-
|
|
8224
|
-
|
|
8225
|
-
)
|
|
8226
|
-
);
|
|
8212
|
+
case 149 /* VariantDeclaration */: {
|
|
8213
|
+
result.push(this.createItem(
|
|
8214
|
+
9 /* Variant */,
|
|
8215
|
+
node2.name.value,
|
|
8216
|
+
node2.rangeWithoutTrivia,
|
|
8217
|
+
node2.name.rangeWithoutTrivia,
|
|
8218
|
+
items
|
|
8219
|
+
));
|
|
8227
8220
|
break;
|
|
8228
8221
|
}
|
|
8229
|
-
case
|
|
8230
|
-
result.push(
|
|
8231
|
-
|
|
8232
|
-
|
|
8233
|
-
|
|
8234
|
-
|
|
8235
|
-
|
|
8236
|
-
|
|
8237
|
-
)
|
|
8238
|
-
);
|
|
8222
|
+
case 150 /* TypeParameterDeclaration */: {
|
|
8223
|
+
result.push(this.createItem(
|
|
8224
|
+
18 /* TypeParameter */,
|
|
8225
|
+
node2.name.value,
|
|
8226
|
+
node2.rangeWithoutTrivia,
|
|
8227
|
+
node2.name.rangeWithoutTrivia,
|
|
8228
|
+
items
|
|
8229
|
+
));
|
|
8239
8230
|
break;
|
|
8240
8231
|
}
|
|
8241
8232
|
case 56 /* NestedFunctionDeclaration */: {
|
|
8242
|
-
result.push(
|
|
8243
|
-
|
|
8244
|
-
|
|
8245
|
-
|
|
8246
|
-
|
|
8247
|
-
|
|
8248
|
-
|
|
8249
|
-
)
|
|
8250
|
-
);
|
|
8233
|
+
result.push(this.createItem(
|
|
8234
|
+
19 /* NestedFunction */,
|
|
8235
|
+
node2.name.value,
|
|
8236
|
+
node2.rangeWithoutTrivia,
|
|
8237
|
+
node2.name.rangeWithoutTrivia,
|
|
8238
|
+
items
|
|
8239
|
+
));
|
|
8251
8240
|
break;
|
|
8252
8241
|
}
|
|
8253
8242
|
default: {
|
|
@@ -8466,9 +8455,15 @@ var SelectionRangeService = class {
|
|
|
8466
8455
|
if (!this.nodeShouldBeSkipped(child) && !child.rangeWithoutTrivia.equals(result.range)) {
|
|
8467
8456
|
result = new SelectionRange(child.rangeWithoutTrivia, result);
|
|
8468
8457
|
}
|
|
8469
|
-
if (child.kind === 0 /* Token */ && (child.tokenKind === 6 /* TextLiteral */ || child.tokenKind === 7 /* TextTemplateHead */ || child.tokenKind === 8 /* TextTemplatePart */ || child.tokenKind === 9 /* TextTemplateTail */ || child.tokenKind === 5 /* CharLiteral */)
|
|
8470
|
-
|
|
8471
|
-
|
|
8458
|
+
if (child.kind === 0 /* Token */ && (child.tokenKind === 6 /* TextLiteral */ || child.tokenKind === 7 /* TextTemplateHead */ || child.tokenKind === 8 /* TextTemplatePart */ || child.tokenKind === 9 /* TextTemplateTail */ || child.tokenKind === 5 /* CharLiteral */)) {
|
|
8459
|
+
let textContentStart = child.rangeWithoutTrivia.start + 1;
|
|
8460
|
+
let textContentEnd = child.rangeWithoutTrivia.end - 1;
|
|
8461
|
+
if ((child.flags & 128 /* StartsWithTilde */) !== 0) {
|
|
8462
|
+
textContentStart += 1;
|
|
8463
|
+
}
|
|
8464
|
+
if ((child.flags & 256 /* EndsWithTilde */) !== 0) {
|
|
8465
|
+
textContentEnd -= 1;
|
|
8466
|
+
}
|
|
8472
8467
|
if (offset >= textContentStart && offset < textContentEnd) {
|
|
8473
8468
|
result = new SelectionRange(new Range(textContentStart, textContentEnd), result);
|
|
8474
8469
|
}
|
|
@@ -8497,7 +8492,7 @@ var SelectionRangeService = class {
|
|
|
8497
8492
|
}
|
|
8498
8493
|
}
|
|
8499
8494
|
switch (node.kind) {
|
|
8500
|
-
case
|
|
8495
|
+
case 163 /* TypeAnnotation */:
|
|
8501
8496
|
case 32 /* StructuredTypeDeclarationBody */:
|
|
8502
8497
|
case 37 /* VariantTypeDeclarationBody */:
|
|
8503
8498
|
case 21 /* AliasTypeDeclarationBody */:
|
|
@@ -8547,13 +8542,11 @@ var SemanticTokensService = class {
|
|
|
8547
8542
|
if (meaning.kind === "variable-access") {
|
|
8548
8543
|
const variable = meaning.variable.getEntity();
|
|
8549
8544
|
if (variable.subkind === "field" && variable.isVariant()) {
|
|
8550
|
-
result.push(
|
|
8551
|
-
|
|
8552
|
-
|
|
8553
|
-
|
|
8554
|
-
|
|
8555
|
-
)
|
|
8556
|
-
);
|
|
8545
|
+
result.push(new SemanticToken(
|
|
8546
|
+
node.rangeWithoutTrivia,
|
|
8547
|
+
3 /* Variant */,
|
|
8548
|
+
new SemanticTokenModifiers().makeConst()
|
|
8549
|
+
));
|
|
8557
8550
|
} else {
|
|
8558
8551
|
const specialVariableInfo = variable.isSpecial();
|
|
8559
8552
|
if (specialVariableInfo !== void 0) {
|
|
@@ -8566,7 +8559,6 @@ var SemanticTokensService = class {
|
|
|
8566
8559
|
case "implicit-function-block-parameter":
|
|
8567
8560
|
semanticTokenKind = 0 /* FunctionBlockLiteralParameter */;
|
|
8568
8561
|
break;
|
|
8569
|
-
case "text-template-function-type-parameter":
|
|
8570
8562
|
case "backing":
|
|
8571
8563
|
semanticTokenKind = void 0;
|
|
8572
8564
|
break;
|
|
@@ -8643,7 +8635,7 @@ var SemanticTokensService = class {
|
|
|
8643
8635
|
));
|
|
8644
8636
|
}
|
|
8645
8637
|
}
|
|
8646
|
-
if (node.kind ===
|
|
8638
|
+
if (node.kind === 149 /* VariantDeclaration */) {
|
|
8647
8639
|
result.push(
|
|
8648
8640
|
new SemanticToken(
|
|
8649
8641
|
node.name.rangeWithoutTrivia,
|
|
@@ -8824,7 +8816,7 @@ var TypeParameterSignatureHelpProvider = class {
|
|
|
8824
8816
|
}
|
|
8825
8817
|
let node = token.parent;
|
|
8826
8818
|
while (node !== void 0) {
|
|
8827
|
-
if (node.kind ===
|
|
8819
|
+
if (node.kind === 159 /* TypeArgumentClause */ && this.offset >= node.lessThanToken.rangeWithoutTrivia.end && (node.greaterThanToken.rangeWithoutTrivia.isEmpty || this.offset <= node.greaterThanToken.rangeWithoutTrivia.start)) {
|
|
8828
8820
|
const argumentIndex = this.getArgumentIndex(node.typeArgumentList, this.offset);
|
|
8829
8821
|
const argumentCount = this.countArguments(node.typeArgumentList);
|
|
8830
8822
|
return new NodeWithTypeArgumentsInfo(node.parent, argumentIndex, argumentCount);
|
|
@@ -8871,7 +8863,7 @@ var TypeParameterSignatureHelpProvider = class {
|
|
|
8871
8863
|
return this.getSignaturesForNamedTypeSpecifier(node);
|
|
8872
8864
|
case 90 /* GenericSpecializationExpression */:
|
|
8873
8865
|
return this.getSignaturesForGenericSpecializationExpression(node);
|
|
8874
|
-
case
|
|
8866
|
+
case 154 /* Tag */:
|
|
8875
8867
|
return this.getSignaturesForTag(node);
|
|
8876
8868
|
default:
|
|
8877
8869
|
Debug.never(node);
|
|
@@ -9205,7 +9197,7 @@ var ParametersSignatureHelpProvider = class {
|
|
|
9205
9197
|
}
|
|
9206
9198
|
break;
|
|
9207
9199
|
}
|
|
9208
|
-
case
|
|
9200
|
+
case 154 /* Tag */: {
|
|
9209
9201
|
if (node.openParenthesisToken !== void 0 && this.offset >= node.openParenthesisToken.rangeWithoutTrivia.end && node.argumentList !== void 0 && (node.closeParenthesisToken === void 0 || node.closeParenthesisToken.rangeWithoutTrivia.isEmpty || this.offset <= node.closeParenthesisToken.rangeWithoutTrivia.start)) {
|
|
9210
9202
|
const argumentIndex = this.getArgumentIndexInList(node.argumentList.elements, this.offset);
|
|
9211
9203
|
const args = ArgumentFactory.createArgumentsOfTag(node);
|
|
@@ -9438,12 +9430,12 @@ import {
|
|
|
9438
9430
|
Reentrance,
|
|
9439
9431
|
Transaction,
|
|
9440
9432
|
atomic as atomic2,
|
|
9441
|
-
|
|
9433
|
+
disposeObservableObject as disposeObservableObject2,
|
|
9434
|
+
manageReactiveOperation,
|
|
9435
|
+
observable as observable2,
|
|
9442
9436
|
options,
|
|
9443
9437
|
reactive,
|
|
9444
|
-
|
|
9445
|
-
manageReactiveOperation,
|
|
9446
|
-
disposeObservableObject as disposeObservableObject2
|
|
9438
|
+
runNonReactively
|
|
9447
9439
|
} from "reactronic";
|
|
9448
9440
|
var highPriorityDiagnosticsCollectionIndicator = Indicator.create(
|
|
9449
9441
|
"HighPriorityDiagnosticsCollectionIndicator",
|
|
@@ -9556,7 +9548,7 @@ var CompilationController = class extends ObservableObject2 {
|
|
|
9556
9548
|
if (!controller.hasConvertedConfiguration) {
|
|
9557
9549
|
return;
|
|
9558
9550
|
}
|
|
9559
|
-
configurationByPackageOrGroupUri.set(packageUri, controller.convertedConfiguration);
|
|
9551
|
+
configurationByPackageOrGroupUri.set(packageUri, Option.fromNullable(controller.convertedConfiguration));
|
|
9560
9552
|
}
|
|
9561
9553
|
let mainPackageConfigurationProvider;
|
|
9562
9554
|
if (this.config.mainPackageConfigurationIfMissing !== void 0) {
|
|
@@ -9881,12 +9873,10 @@ var CompilationController = class extends ObservableObject2 {
|
|
|
9881
9873
|
if (version !== void 0 && version === configurationController.convertedConfigurationVersion) {
|
|
9882
9874
|
continue;
|
|
9883
9875
|
}
|
|
9884
|
-
changedConfigurations.push(
|
|
9885
|
-
|
|
9886
|
-
|
|
9887
|
-
|
|
9888
|
-
)
|
|
9889
|
-
);
|
|
9876
|
+
changedConfigurations.push(new ChangedPackageConfiguration(
|
|
9877
|
+
configurationController.packageUri,
|
|
9878
|
+
configurationController.convertedConfiguration === void 0
|
|
9879
|
+
));
|
|
9890
9880
|
this.checkedConfigurationVersionByPackageUri.set(
|
|
9891
9881
|
packageUri,
|
|
9892
9882
|
configurationController.convertedConfigurationVersion
|
|
@@ -9901,15 +9891,17 @@ var CompilationController = class extends ObservableObject2 {
|
|
|
9901
9891
|
createConfigurationProvider(configurationByPackageUri) {
|
|
9902
9892
|
return (configurationDirectory, isLoadedFromNodeModules, process) => __async(this, null, function* () {
|
|
9903
9893
|
const packageOrGroupUri = configurationDirectory.packageOrGroupUri.toString();
|
|
9904
|
-
|
|
9905
|
-
|
|
9906
|
-
return configuration;
|
|
9894
|
+
const configuration = configurationByPackageUri.get(packageOrGroupUri);
|
|
9895
|
+
if (configuration !== void 0) {
|
|
9896
|
+
return configuration.toNullable();
|
|
9907
9897
|
} else {
|
|
9908
|
-
|
|
9909
|
-
|
|
9910
|
-
|
|
9898
|
+
let result = this.configurationsOfPackagesOutsideProject_.get(packageOrGroupUri);
|
|
9899
|
+
if (result === void 0) {
|
|
9900
|
+
const configuration2 = yield process(configurationDirectory);
|
|
9901
|
+
result = Option.fromNullable(configuration2);
|
|
9902
|
+
this.configurationsOfPackagesOutsideProject_.set(packageOrGroupUri, result);
|
|
9911
9903
|
}
|
|
9912
|
-
return
|
|
9904
|
+
return result.toNullable();
|
|
9913
9905
|
}
|
|
9914
9906
|
});
|
|
9915
9907
|
}
|
|
@@ -11551,9 +11543,7 @@ var _Workspace = class _Workspace extends ObservableObject6 {
|
|
|
11551
11543
|
processControllersWithUnprocessedConfigs() {
|
|
11552
11544
|
return __async(this, null, function* () {
|
|
11553
11545
|
this.compilationControllers_.forEach((c) => c.state);
|
|
11554
|
-
if (this.compilationControllers_.some(
|
|
11555
|
-
(c) => c.state === 1 /* ProcessingInitialPackageConfigs */ && c.isConfigurationsProcessingEnabled
|
|
11556
|
-
)) {
|
|
11546
|
+
if (this.compilationControllers_.some((c) => c.state === 1 /* ProcessingInitialPackageConfigs */ && c.isConfigurationsProcessingEnabled)) {
|
|
11557
11547
|
return;
|
|
11558
11548
|
}
|
|
11559
11549
|
const controllerToLoad = this.getControllerToLoad();
|
|
@@ -11630,9 +11620,7 @@ var _Workspace = class _Workspace extends ObservableObject6 {
|
|
|
11630
11620
|
return void 0;
|
|
11631
11621
|
}
|
|
11632
11622
|
if (!this.atLeastOneFileOfCompilationHasBeenOpened && this.config.initiallyOpenedFileUris !== void 0) {
|
|
11633
|
-
const controller2 = controllersWithUnprocessedConfigs.find(
|
|
11634
|
-
(c) => this.config.initiallyOpenedFileUris.some((f) => f.checkIfRelativeTo(c.uri) !== 2 /* NotRelativeOrEqual */)
|
|
11635
|
-
);
|
|
11623
|
+
const controller2 = controllersWithUnprocessedConfigs.find((c) => this.config.initiallyOpenedFileUris.some((f) => f.checkIfRelativeTo(c.uri) !== 2 /* NotRelativeOrEqual */));
|
|
11636
11624
|
if (controller2 !== void 0) {
|
|
11637
11625
|
return controller2;
|
|
11638
11626
|
}
|
|
@@ -12337,7 +12325,7 @@ var SourceGenerationService = class extends ObservableObject7 {
|
|
|
12337
12325
|
}
|
|
12338
12326
|
createGeneratedPackageConfiguration(entity, packageLocale, packageDialect) {
|
|
12339
12327
|
let targetPlatform;
|
|
12340
|
-
const interfacePackageInfo = entity.
|
|
12328
|
+
const interfacePackageInfo = entity.getInterfacePackageInfo();
|
|
12341
12329
|
if (interfacePackageInfo !== void 0) {
|
|
12342
12330
|
switch (interfacePackageInfo.kind) {
|
|
12343
12331
|
case "multi-platform":
|
|
@@ -12410,7 +12398,7 @@ var SourceGenerationService = class extends ObservableObject7 {
|
|
|
12410
12398
|
return false;
|
|
12411
12399
|
case 11 /* TypeExtension */:
|
|
12412
12400
|
return true;
|
|
12413
|
-
case 13 /*
|
|
12401
|
+
case 13 /* TextTranslation */:
|
|
12414
12402
|
return true;
|
|
12415
12403
|
default:
|
|
12416
12404
|
Debug.never(entity);
|
|
@@ -12487,7 +12475,7 @@ var EntityFinder = class {
|
|
|
12487
12475
|
case 12 /* Package */:
|
|
12488
12476
|
case 11 /* TypeExtension */:
|
|
12489
12477
|
return void 0;
|
|
12490
|
-
case 13 /*
|
|
12478
|
+
case 13 /* TextTranslation */:
|
|
12491
12479
|
return void 0;
|
|
12492
12480
|
default:
|
|
12493
12481
|
Debug.never(entity);
|
|
@@ -12677,7 +12665,7 @@ var EntityFinder = class {
|
|
|
12677
12665
|
case 11 /* TypeExtension */:
|
|
12678
12666
|
case 6 /* DereferenceOperator */:
|
|
12679
12667
|
return void 0;
|
|
12680
|
-
case 13 /*
|
|
12668
|
+
case 13 /* TextTranslation */:
|
|
12681
12669
|
return void 0;
|
|
12682
12670
|
default:
|
|
12683
12671
|
Debug.never(entity);
|
|
@@ -12704,7 +12692,7 @@ var EntityFinder = class {
|
|
|
12704
12692
|
case 12 /* Package */:
|
|
12705
12693
|
case 11 /* TypeExtension */:
|
|
12706
12694
|
case 9 /* Operator */:
|
|
12707
|
-
case 13 /*
|
|
12695
|
+
case 13 /* TextTranslation */:
|
|
12708
12696
|
return void 0;
|
|
12709
12697
|
default:
|
|
12710
12698
|
Debug.never(entity);
|
|
@@ -12860,14 +12848,12 @@ var LanguageServer = class {
|
|
|
12860
12848
|
if (builtInStandardPackagesUri !== void 0) {
|
|
12861
12849
|
additionalUrisOfDirectoriesToLoad.push(builtInStandardPackagesUri);
|
|
12862
12850
|
}
|
|
12863
|
-
fileSystemTreeProvider = runAtomically3(
|
|
12864
|
-
|
|
12865
|
-
|
|
12866
|
-
|
|
12867
|
-
|
|
12868
|
-
|
|
12869
|
-
)
|
|
12870
|
-
);
|
|
12851
|
+
fileSystemTreeProvider = runAtomically3(() => new FileSystemTreeProviderBasedOnWatchedFileSystem(
|
|
12852
|
+
fileSystem,
|
|
12853
|
+
publisher,
|
|
12854
|
+
void 0,
|
|
12855
|
+
additionalUrisOfDirectoriesToLoad
|
|
12856
|
+
));
|
|
12871
12857
|
break;
|
|
12872
12858
|
}
|
|
12873
12859
|
case "client-to-server-requests": {
|