Merge pull request #107 from github/thyeggman/no-repo

Reset github context on workspace changes

Author: thyeggman

src/commands/triggerWorkflowRun.ts

@@ -38,7 +38,7 @@ export function registerTriggerWorkflowRun(context: vscode.ExtensionContext) {
           return;
         }
 
-        const workflow = await parseWorkflowFile(workflowUri, gitHubRepoContext);
+        const workflow = await parseWorkflowFile(workflowUri);
         if (!workflow) {
           return;
         }

src/extension.ts

@@ -26,6 +26,7 @@ import {WorkflowStepLogSymbolProvider} from "./logs/symbolProvider";
 import {initPinnedWorkflows} from "./pinnedWorkflows/pinnedWorkflows";
 import {RunStore} from "./store/store";
 import {initWorkflowDocumentTracking} from "./tracker/workflowDocumentTracker";
+import {initWorkspaceChangeTracker} from "./tracker/workspaceTracker";
 import {initResources} from "./treeViews/icons";
 import {initTreeViews} from "./treeViews/treeViews";
 import {deactivateLanguageServer, initLanguageServer} from "./workflow/languageServer";
@@ -41,7 +42,8 @@ export async function activate(context: vscode.ExtensionContext) {
   initResources(context);
   initConfiguration(context);
 
-  // Track workflow documents
+  // Track workflow documents and workspace changes
+  initWorkspaceChangeTracker(context);
   await initWorkflowDocumentTracking(context);
 
   const store = new RunStore();

src/git/repository.ts

@@ -210,6 +210,10 @@ export async function getGitHubContext(): Promise<GitHubContext | undefined> {
   return gitHubContext;
 }
 
+export function resetGitHubContext() {
+  gitHubContext = undefined;
+}
+
 export async function getGitHubContextForRepo(owner: string, name: string): Promise<GitHubRepoContext | undefined> {
   const gitHubContext = await getGitHubContext();
   if (!gitHubContext) {

src/tracker/workspaceTracker.ts

@@ -0,0 +1,13 @@
+import * as vscode from "vscode";
+
+import {getGitHubContext, resetGitHubContext} from "../git/repository";
+
+export function initWorkspaceChangeTracker(context: vscode.ExtensionContext) {
+  const onDidChangeWorkspaceFolders = async (event: vscode.WorkspaceFoldersChangeEvent) => {
+    if (event.added.length > 0 || event.removed.length > 0) {
+      resetGitHubContext();
+      await getGitHubContext();
+    }
+  };
+  context.subscriptions.push(vscode.workspace.onDidChangeWorkspaceFolders(onDidChangeWorkspaceFolders));
+}

src/workflow/workflow.ts

@@ -58,7 +58,7 @@ export function getWorkflowUri(gitHubRepoContext: GitHubRepoContext, path: strin
   return vscode.Uri.joinPath(gitHubRepoContext.workspaceUri, path);
 }
 
-export async function parseWorkflowFile(uri: vscode.Uri, _: GitHubRepoContext): Promise<WorkflowTemplate | undefined> {
+export async function parseWorkflowFile(uri: vscode.Uri): Promise<WorkflowTemplate | undefined> {
   try {
     const b = await vscode.workspace.fs.readFile(uri);
     const workflowInput = new TextDecoder().decode(b);