From 6aaeefb9c25da8f16467dab10670707549948125 Mon Sep 17 00:00:00 2001
From: Jacob Wallraff <thyeggman@github.com>
Date: Mon, 6 Mar 2023 11:33:28 -0800
Subject: [PATCH] Remove unused code and address feedback

---
 languageservice/src/complete.ts             | 2 +-
 languageservice/src/document-links.ts       | 2 +-
 languageservice/src/hover.ts                | 2 +-
 languageservice/src/utils/workflow-cache.ts | 3 +--
 languageservice/src/validate.ts             | 2 +-
 workflow-parser/README.md                   | 2 +-
 workflow-parser/src/model/convert.ts        | 2 --
 7 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/languageservice/src/complete.ts b/languageservice/src/complete.ts
index 3a0cad2..8f355f7 100644
--- a/languageservice/src/complete.ts
+++ b/languageservice/src/complete.ts
@@ -70,7 +70,7 @@ export async function complete(
     return [];
   }
 
-  const template = await fetchOrConvertWorkflowTemplate(file, parsedWorkflow, textDocument.uri, config, {
+  const template = await fetchOrConvertWorkflowTemplate(parsedWorkflow, textDocument.uri, config, {
     fetchReusableWorkflowDepth: config?.fileProvider ? 1 : 0,
     errorPolicy: ErrorPolicy.TryConversion
   });
diff --git a/languageservice/src/document-links.ts b/languageservice/src/document-links.ts
index bd14ce1..a78ff9f 100644
--- a/languageservice/src/document-links.ts
+++ b/languageservice/src/document-links.ts
@@ -18,7 +18,7 @@ export async function documentLinks(document: TextDocument): Promise<DocumentLin
     return [];
   }
 
-  const template = await fetchOrConvertWorkflowTemplate(file, parsedWorkflow, document.uri, undefined, {
+  const template = await fetchOrConvertWorkflowTemplate(parsedWorkflow, document.uri, undefined, {
     errorPolicy: ErrorPolicy.TryConversion
   });
 
diff --git a/languageservice/src/hover.ts b/languageservice/src/hover.ts
index a888b1b..11f3e77 100644
--- a/languageservice/src/hover.ts
+++ b/languageservice/src/hover.ts
@@ -48,7 +48,7 @@ export async function hover(document: TextDocument, position: Position, config?:
     return null;
   }
 
-  const template = await fetchOrConvertWorkflowTemplate(file, parsedWorkflow, document.uri, config, {
+  const template = await fetchOrConvertWorkflowTemplate(parsedWorkflow, document.uri, config, {
     errorPolicy: ErrorPolicy.TryConversion,
     fetchReusableWorkflowDepth: config?.fileProvider ? 1 : 0
   });
diff --git a/languageservice/src/utils/workflow-cache.ts b/languageservice/src/utils/workflow-cache.ts
index eb0c19e..98473bf 100644
--- a/languageservice/src/utils/workflow-cache.ts
+++ b/languageservice/src/utils/workflow-cache.ts
@@ -27,7 +27,7 @@ export function clearWorkflowTemplateCache() {
 
 export function fetchOrParseWorkflow(file: File, uri: string): ParseWorkflowResult | undefined {
   let result = parsedWorkflowCache.get(uri);
-  if (!result || !result.value) {
+  if (!result?.value) {
     result = parseWorkflow(file, nullTrace);
     if (!result.value) {
       return undefined;
@@ -38,7 +38,6 @@ export function fetchOrParseWorkflow(file: File, uri: string): ParseWorkflowResu
 }
 
 export async function fetchOrConvertWorkflowTemplate(
-  file: File,
   parsedWorkflow: ParseWorkflowResult,
   uri: string,
   config?: CompletionConfig,
diff --git a/languageservice/src/validate.ts b/languageservice/src/validate.ts
index 4ff223e..87f45d8 100644
--- a/languageservice/src/validate.ts
+++ b/languageservice/src/validate.ts
@@ -53,7 +53,7 @@ export async function validate(textDocument: TextDocument, config?: ValidationCo
 
     if (parsedWorkflow.value) {
       // Errors will be updated in the context. Attempt to do the conversion anyway in order to give the user more information
-      const template = await fetchOrConvertWorkflowTemplate(file, parsedWorkflow, textDocument.uri, config, {
+      const template = await fetchOrConvertWorkflowTemplate(parsedWorkflow, textDocument.uri, config, {
         fetchReusableWorkflowDepth: config?.fileProvider ? 1 : 0,
         errorPolicy: ErrorPolicy.TryConversion
       });
diff --git a/workflow-parser/README.md b/workflow-parser/README.md
index dcdf31c..e480668 100644
--- a/workflow-parser/README.md
+++ b/workflow-parser/README.md
@@ -38,7 +38,7 @@ jobs:
 `convertWorkflowTemplate` then takes that intermediate representation and converts it to a [`WorkflowTemplate`](./src/workflow-template.ts) object, which is a more convenient representation for working with workflows.
 
 ```typescript
-const workflowTemplate = await convertWorkflowTemplate("test.yaml", result.context, result.value);
+const workflowTemplate = await convertWorkflowTemplate(result.context, result.value);
 
 // workflowTemplate.jobs[0].id === "build"
 // workflowTemplate.jobs[0].steps[0].run === "echo 'hello'"
diff --git a/workflow-parser/src/model/convert.ts b/workflow-parser/src/model/convert.ts
index 4e11dfc..47e9373 100644
--- a/workflow-parser/src/model/convert.ts
+++ b/workflow-parser/src/model/convert.ts
@@ -11,8 +11,6 @@ import {convertReferencedWorkflow} from "./converter/referencedWorkflow";
 import {isReusableWorkflowJob} from "./type-guards";
 import {WorkflowTemplate} from "./workflow-template";
 
-const workflowTemplateCache = new Map<string, WorkflowTemplate>();
-
 export enum ErrorPolicy {
   ReturnErrorsOnly,
   TryConversion