Skip to content

Commit d90f6c0

Browse files
thyeggmanthyeggman
committed
Undo refactor and format
1 parent da81ff5 commit d90f6c0

7 files changed

Lines changed: 46 additions & 57 deletions

File tree

‎src/git/repository.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {getRemoteName} from "../configuration/configuration";
66
import {Protocol} from "../external/protocol";
77
import {logDebug, logError} from "../log";
88
import {API, GitExtension, RefType, RepositoryState} from "../typings/git";
9-
import {hasInternetConnectivity} from "../util"
9+
import {hasInternetConnectivity} from "../util";
1010

1111
interface GitHubUrls {
1212
workspaceUri: vscode.Uri;

‎src/treeViews/currentBranch.ts‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,21 @@ import {WorkflowJobNode} from "./shared/workflowJobNode";
1111
import {WorkflowRunNode} from "./shared/workflowRunNode";
1212
import {WorkflowRunTreeDataProvider} from "./workflowRunTreeDataProvider";
1313
import {NoInternetConnectivityNode} from "./shared/noInternetConnectivityNode";
14-
import {CurrentBranchTreeNode} from "./settings/types";
15-
import {hasInternetConnectivity} from "../util"
14+
import {hasInternetConnectivity} from "../util";
15+
import {NoRunForBranchNode} from "./current-branch/noRunForBranchNode";
16+
import {NoWorkflowJobsNode} from "./shared/noWorkflowJobsNode";
17+
import {WorkflowStepNode} from "./workflows/workflowStepNode";
18+
19+
type CurrentBranchTreeNode =
20+
| CurrentBranchRepoNode
21+
| WorkflowRunNode
22+
| PreviousAttemptsNode
23+
| AttemptNode
24+
| WorkflowJobNode
25+
| NoWorkflowJobsNode
26+
| WorkflowStepNode
27+
| NoRunForBranchNode
28+
| NoInternetConnectivityNode;
1629

1730
export class CurrentBranchTreeProvider
1831
extends WorkflowRunTreeDataProvider
@@ -33,9 +46,8 @@ export class CurrentBranchTreeProvider
3346
// Don't delete all the nodes if we don't have internet connectivity
3447
if (await hasInternetConnectivity()) {
3548
this._onDidChangeTreeData.fire(null);
36-
}
37-
else {
38-
await vscode.window.showWarningMessage("Unable to refresh, you are not connected to the internet")
49+
} else {
50+
await vscode.window.showWarningMessage("Unable to refresh, you are not connected to the internet");
3951
}
4052
}
4153

‎src/treeViews/settings.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {EnvironmentVariablesNode} from "./settings/environmentVariablesNode";
1515
import {OrgVariablesNode} from "./settings/orgVariablesNode";
1616
import {OrgSecretsNode} from "./settings/orgSecretsNode";
1717
import {NoInternetConnectivityNode} from "./shared/noInternetConnectivityNode";
18-
import {hasInternetConnectivity} from "../util"
18+
import {hasInternetConnectivity} from "../util";
1919

2020
export class SettingsTreeProvider implements vscode.TreeDataProvider<SettingsExplorerNode> {
2121
private _onDidChangeTreeData = new vscode.EventEmitter<SettingsExplorerNode | null>();
@@ -25,9 +25,8 @@ export class SettingsTreeProvider implements vscode.TreeDataProvider<SettingsExp
2525
// Don't delete all the nodes if we don't have internet connectivity
2626
if (await hasInternetConnectivity()) {
2727
this._onDidChangeTreeData.fire(null);
28-
}
29-
else {
30-
await vscode.window.showWarningMessage("Unable to refresh, you are not connected to the internet")
28+
} else {
29+
await vscode.window.showWarningMessage("Unable to refresh, you are not connected to the internet");
3130
}
3231
}
3332

‎src/treeViews/settings/types.ts‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,7 @@ import {RepoVariablesNode} from "./repoVariablesNode";
1111
import {OrgVariablesNode} from "./orgVariablesNode";
1212
import {OrgSecretsNode} from "./orgSecretsNode";
1313
import {RepoSecretsNode} from "./repoSecretsNode";
14-
import {NoGitHubRepositoryNode} from "../shared/noGitHubRepositoryNode";
15-
import {NoWorkflowJobsNode} from "../shared/noWorkflowJobsNode";
16-
import {WorkflowStepNode} from "../workflows/workflowStepNode";
17-
import {AttemptNode} from "../shared/attemptNode";
18-
import {AuthenticationNode} from "../shared/authenticationNode";
19-
import {PreviousAttemptsNode} from "../shared/previousAttemptsNode";
20-
import {WorkflowJobNode} from "../shared/workflowJobNode";
21-
import {WorkflowRunNode} from "../shared/workflowRunNode";
22-
import {WorkflowNode} from "../workflows/workflowNode";
2314
import {NoInternetConnectivityNode} from "../shared/noInternetConnectivityNode";
24-
import {NoRunForBranchNode} from "../current-branch/noRunForBranchNode";
25-
import {CurrentBranchRepoNode} from "../current-branch/currentBranchRepoNode";
2615

2716
export type SettingsExplorerNode =
2817
| SecretsNode
@@ -39,26 +28,3 @@ export type SettingsExplorerNode =
3928
| VariablesNode
4029
| EmptyNode
4130
| NoInternetConnectivityNode;
42-
43-
export type WorkflowsTreeNode =
44-
| AuthenticationNode
45-
| NoGitHubRepositoryNode
46-
| WorkflowNode
47-
| WorkflowRunNode
48-
| PreviousAttemptsNode
49-
| AttemptNode
50-
| WorkflowJobNode
51-
| NoWorkflowJobsNode
52-
| WorkflowStepNode
53-
| NoInternetConnectivityNode;
54-
55-
export type CurrentBranchTreeNode =
56-
| CurrentBranchRepoNode
57-
| WorkflowRunNode
58-
| PreviousAttemptsNode
59-
| AttemptNode
60-
| WorkflowJobNode
61-
| NoWorkflowJobsNode
62-
| WorkflowStepNode
63-
| NoRunForBranchNode
64-
| NoInternetConnectivityNode;

‎src/treeViews/shared/noInternetConnectivityNode.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as vscode from "vscode";
22

33
/**
4-
* When no github.com remote can be found in the current workspace.
4+
* Shown when no calls to the github API can be made.
55
*/
66
export class NoInternetConnectivityNode extends vscode.TreeItem {
77
constructor() {

‎src/treeViews/workflows.ts‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,23 @@ import {WorkflowRunNode} from "./shared/workflowRunNode";
1212
import {WorkflowRunTreeDataProvider} from "./workflowRunTreeDataProvider";
1313
import {WorkflowNode} from "./workflows/workflowNode";
1414
import {getWorkflowNodes, WorkflowsRepoNode} from "./workflows/workflowsRepoNode";
15-
import {WorkflowsTreeNode} from "./settings/types";
1615
import {NoInternetConnectivityNode} from "./shared/noInternetConnectivityNode";
17-
import {hasInternetConnectivity} from "../util"
16+
import {hasInternetConnectivity} from "../util";
17+
import {NoWorkflowJobsNode} from "./shared/noWorkflowJobsNode";
18+
import {WorkflowStepNode} from "./workflows/workflowStepNode";
19+
import {NoGitHubRepositoryNode} from "./shared/noGitHubRepositoryNode";
20+
21+
type WorkflowsTreeNode =
22+
| AuthenticationNode
23+
| NoGitHubRepositoryNode
24+
| WorkflowNode
25+
| WorkflowRunNode
26+
| PreviousAttemptsNode
27+
| AttemptNode
28+
| WorkflowJobNode
29+
| NoWorkflowJobsNode
30+
| WorkflowStepNode
31+
| NoInternetConnectivityNode;
1832

1933
export class WorkflowsTreeProvider
2034
extends WorkflowRunTreeDataProvider
@@ -35,9 +49,8 @@ export class WorkflowsTreeProvider
3549
// Don't delete all the nodes if we don't have internet connectivity
3650
if (await hasInternetConnectivity()) {
3751
this._onDidChangeTreeData.fire(null);
38-
}
39-
else {
40-
await vscode.window.showWarningMessage("Unable to refresh, you are not connected to the internet")
52+
} else {
53+
await vscode.window.showWarningMessage("Unable to refresh, you are not connected to the internet");
4154
}
4255
}
4356

‎src/util.ts‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@ import {logError} from "./log";
44

55
export async function hasInternetConnectivity() {
66
try {
7-
const octokit = new Octokit()
8-
await octokit.request('GET /', {
7+
const octokit = new Octokit();
8+
await octokit.request("GET /", {
99
headers: {
10-
'X-GitHub-Api-Version': '2022-11-28'
10+
"X-GitHub-Api-Version": "2022-11-28"
1111
}
12-
})
13-
}
14-
catch {
12+
});
13+
} catch {
1514
logError(new Error("Unable to connect to the internet"));
1615
return false;
1716
}
1817
return true;
19-
}
18+
}

0 commit comments

Comments
 (0)