Skip to content

Commit 8d8f63f

Browse files
committed
Add featureFlags param with lint ignore
1 parent 7ac83f4 commit 8d8f63f

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

expressions/src/completion.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import {DescriptionPair} from "./completion/descriptionDictionary.js";
22
import {Dictionary, isDictionary} from "./data/dictionary.js";
33
import {ExpressionData} from "./data/expressiondata.js";
44
import {Evaluator} from "./evaluator.js";
5+
import {FeatureFlags} from "./features.js";
56
import {wellKnownFunctions} from "./funcs.js";
67
import {FunctionDefinition, FunctionInfo} from "./funcs/info.js";
78
import {Lexer, Token, TokenType} from "./lexer.js";
@@ -32,7 +33,9 @@ export function complete(
3233
input: string,
3334
context: Dictionary,
3435
extensionFunctions: FunctionInfo[],
35-
functions?: Map<string, FunctionDefinition>
36+
functions?: Map<string, FunctionDefinition>,
37+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
38+
featureFlags?: FeatureFlags
3639
): CompletionItem[] {
3740
// Lex
3841
const lexer = new Lexer(input);

languageservice/src/complete.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ export async function complete(
141141
func.description = getFunctionDescription(func.name);
142142
}
143143

144-
return getExpressionCompletionItems(token, context, extensionFunctions, newPos);
144+
return getExpressionCompletionItems(token, context, extensionFunctions, newPos, config?.featureFlags);
145145
}
146146

147147
const indentation = guessIndentation(newDoc, 2, true); // Use 2 spaces as default and most common for YAML
@@ -531,7 +531,8 @@ function getExpressionCompletionItems(
531531
token: TemplateToken,
532532
context: DescriptionDictionary,
533533
extensionFunctions: FunctionInfo[],
534-
pos: Position
534+
pos: Position,
535+
featureFlags?: FeatureFlags
535536
): CompletionItem[] {
536537
if (!token.range) {
537538
return [];
@@ -550,7 +551,7 @@ function getExpressionCompletionItems(
550551
const expressionInput = (getExpressionInput(currentInput, cursorOffset) || "").trim();
551552

552553
try {
553-
return completeExpression(expressionInput, context, extensionFunctions, validatorFunctions).map(item =>
554+
return completeExpression(expressionInput, context, extensionFunctions, validatorFunctions, featureFlags).map(item =>
554555
mapExpressionCompletionItem(item, currentInput[cursorOffset])
555556
);
556557
} catch (e) {

0 commit comments

Comments
 (0)