diff --git a/languageserver/src/connection.ts b/languageserver/src/connection.ts index 6b57d43..3728110 100644 --- a/languageserver/src/connection.ts +++ b/languageserver/src/connection.ts @@ -28,8 +28,12 @@ import {fetchActionMetadata} from "./utils/action-metadata"; import {TTLCache} from "./utils/cache"; import {timeOperation} from "./utils/timer"; import {valueProviders} from "./value-providers"; -import {clearParsedCache, clearParsedCacheEntry} from "@github/actions-workflow-parser/workflows/workflow-parser"; -import {clearWorkflowTemplateCache, clearWorkflowTemplateCacheEntry} from "@github/actions-workflow-parser/model/convert"; +import { + clearParsedCache, + clearParsedCacheEntry, + clearWorkflowTemplateCache, + clearWorkflowTemplateCacheEntry +} from "@github/actions-languageservice/utils/workflow-cache"; export function initConnection(connection: Connection) { const documents: TextDocuments = new TextDocuments(TextDocument); @@ -100,7 +104,7 @@ export function initConnection(connection: Connection) { clearWorkflowTemplateCache(); }); } - }) + }); // The content of a text document has changed. This event is emitted // when the text document first opened or when its content has changed. diff --git a/languageservice/src/complete.ts b/languageservice/src/complete.ts index bfc4e16..3a0cad2 100644 --- a/languageservice/src/complete.ts +++ b/languageservice/src/complete.ts @@ -1,10 +1,6 @@ import {complete as completeExpression, DescriptionDictionary} from "@github/actions-expressions"; import {CompletionItem as ExpressionCompletionItem} from "@github/actions-expressions/completion"; -import { - isBasicExpression, - isSequence, - isString -} from "@github/actions-workflow-parser"; +import {isBasicExpression, isSequence, isString} from "@github/actions-workflow-parser"; import {ErrorPolicy} from "@github/actions-workflow-parser/model/convert"; import {OPEN_EXPRESSION} from "@github/actions-workflow-parser/templates/template-constants"; import {TemplateToken} from "@github/actions-workflow-parser/templates/tokens/index"; diff --git a/languageservice/src/utils/workflow-cache.ts b/languageservice/src/utils/workflow-cache.ts index 4a8681b..eb0c19e 100644 --- a/languageservice/src/utils/workflow-cache.ts +++ b/languageservice/src/utils/workflow-cache.ts @@ -4,7 +4,7 @@ import {File} from "@github/actions-workflow-parser/workflows/file"; import {ParseWorkflowResult} from "@github/actions-workflow-parser"; import {WorkflowTemplate} from "@github/actions-workflow-parser"; import {nullTrace} from "../nulltrace"; -import { CompletionConfig } from "../complete"; +import {CompletionConfig} from "../complete"; const parsedWorkflowCache = new Map(); const workflowTemplateCache = new Map(); @@ -37,11 +37,22 @@ export function fetchOrParseWorkflow(file: File, uri: string): ParseWorkflowResu return result; } -export async function fetchOrConvertWorkflowTemplate(file: File, parsedWorkflow: ParseWorkflowResult, uri: string, config?: CompletionConfig, options?: WorkflowTemplateConverterOptions): Promise { +export async function fetchOrConvertWorkflowTemplate( + file: File, + parsedWorkflow: ParseWorkflowResult, + uri: string, + config?: CompletionConfig, + options?: WorkflowTemplateConverterOptions +): Promise { let template = workflowTemplateCache.get(uri); if (!template) { - template = await convertWorkflowTemplate(file.name, parsedWorkflow.context, parsedWorkflow.value!, config?.fileProvider, options); + template = await convertWorkflowTemplate( + parsedWorkflow.context, + parsedWorkflow.value!, + config?.fileProvider, + options + ); workflowTemplateCache.set(uri, template); } return template; -} \ No newline at end of file +} diff --git a/languageservice/src/validate.ts b/languageservice/src/validate.ts index 10441c6..4ff223e 100644 --- a/languageservice/src/validate.ts +++ b/languageservice/src/validate.ts @@ -1,10 +1,6 @@ import {Evaluator, ExpressionEvaluationError, Lexer, Parser} from "@github/actions-expressions"; import {Expr} from "@github/actions-expressions/ast"; -import { - isBasicExpression, - isString, - WorkflowTemplate -} from "@github/actions-workflow-parser"; +import {isBasicExpression, isString, WorkflowTemplate} from "@github/actions-workflow-parser"; import {ErrorPolicy} from "@github/actions-workflow-parser/model/convert"; import {splitAllowedContext} from "@github/actions-workflow-parser/templates/allowed-context"; import {BasicExpressionToken} from "@github/actions-workflow-parser/templates/tokens/basic-expression-token"; diff --git a/workflow-parser/src/workflows/workflow-parser.ts b/workflow-parser/src/workflows/workflow-parser.ts index b70d0f7..b727653 100644 --- a/workflow-parser/src/workflows/workflow-parser.ts +++ b/workflow-parser/src/workflows/workflow-parser.ts @@ -31,7 +31,7 @@ export function parseWorkflow(entryFile: File, contextOrTrace: TraceWriter | Tem context, value: undefined }; - return result + return result; } const templateToken = templateReader.readTemplate(context, WORKFLOW_ROOT, reader, fileId);