Skip to content

Commit 92a702a

Browse files
thyeggmanthyeggman
committed
Add prettier settings
1 parent 40794a9 commit 92a702a

File tree

8 files changed

+63
-40
lines changed

8 files changed

+63
-40
lines changed

‎.prettierignore‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
node_modules
2+
out
3+
dist
4+
*.vsix
5+
.DS_Store
6+
runners
7+
.yalc

‎.prettierrc‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"tabWidth": 2,
3+
"printWidth": 120,
4+
"useTabs": false,
5+
"bracketSpacing": true,
6+
"bracketSameLine": true,
7+
"trailingComma": "all",
8+
"overrides": [
9+
{
10+
"files": ".prettierrc",
11+
"options": { "parser": "json" }
12+
}
13+
]
14+
}

‎.vscode/settings.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
{
2-
"github-actions.workflows.pinned.workflows": [".github/workflows/build.yml"]
2+
"github-actions.workflows.pinned.workflows": [".github/workflows/build.yml"],
3+
"editor.formatOnSave": true,
4+
"[typescript]": {
5+
"editor.defaultFormatter": "esbenp.prettier-vscode"
6+
},
37
}

‎package-lock.json‎

Lines changed: 22 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,14 +376,15 @@
376376
"@types/uuid": "^3.4.6",
377377
"@types/vscode": "1.60.0",
378378
"@types/yaml": "^1.2.0",
379+
"@vscode/test-web": "*",
379380
"glob": "^7.1.5",
380381
"node-loader": "^0.6.0",
382+
"prettier": "2.7.1",
381383
"rimraf": "^3.0.1",
382384
"ts-loader": "^6.2.1",
383385
"tslint": "^5.20.0",
384386
"typescript": "4.2.3",
385387
"vsce": "1.96.1",
386-
"@vscode/test-web": "*",
387388
"webpack": "^4.44.1",
388389
"webpack-cli": "^3.3.10"
389390
},

‎src/treeViews/icons.ts‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,7 @@ export function getIconForWorkflowRun(runOrJob: IStatusAndConclusion) {
2626

2727
function _getIconForWorkflowrun(
2828
runOrJob: IStatusAndConclusion
29-
):
30-
| string
31-
| vscode.ThemeIcon
32-
| { light: string | vscode.Uri; dark: string | vscode.Uri } {
29+
): string | vscode.ThemeIcon | { light: string | vscode.Uri; dark: string | vscode.Uri } {
3330
switch (runOrJob.status) {
3431
case "completed": {
3532
switch (runOrJob.conclusion) {
@@ -59,9 +56,7 @@ function _getIconForWorkflowrun(
5956
}
6057

6158
/** Get one of the built-in VS Code icons */
62-
export function getCodIconForWorkflowrun(
63-
runOrJob?: IStatusAndConclusion
64-
): string {
59+
export function getCodIconForWorkflowrun(runOrJob?: IStatusAndConclusion): string {
6560
if (!runOrJob) {
6661
return "circle-outline";
6762
}

‎src/treeViews/settings.ts‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,19 @@ import { SelfHostedRunnersNode } from "./settings/selfHostedRunnersNode";
1111
import { SettingsExplorerNode } from "./settings/types";
1212
import { getGitHubContext } from "../git/repository";
1313

14-
export class SettingsTreeProvider
15-
implements vscode.TreeDataProvider<SettingsExplorerNode>
16-
{
17-
private _onDidChangeTreeData =
18-
new vscode.EventEmitter<SettingsExplorerNode | null>();
14+
export class SettingsTreeProvider implements vscode.TreeDataProvider<SettingsExplorerNode> {
15+
private _onDidChangeTreeData = new vscode.EventEmitter<SettingsExplorerNode | null>();
1916
readonly onDidChangeTreeData = this._onDidChangeTreeData.event;
2017

2118
refresh(): void {
2219
this._onDidChangeTreeData.fire(null);
2320
}
2421

25-
getTreeItem(
26-
element: SettingsExplorerNode
27-
): vscode.TreeItem | Thenable<vscode.TreeItem> {
22+
getTreeItem(element: SettingsExplorerNode): vscode.TreeItem | Thenable<vscode.TreeItem> {
2823
return element;
2924
}
3025

31-
async getChildren(
32-
element?: SettingsExplorerNode | undefined
33-
): Promise<SettingsExplorerNode[]> {
26+
async getChildren(element?: SettingsExplorerNode | undefined): Promise<SettingsExplorerNode[]> {
3427
const gitHubContext = await getGitHubContext();
3528
if (!gitHubContext) {
3629
return [];

‎src/treeViews/workflows.ts‎

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
import * as vscode from "vscode";
22

3-
import {
4-
WorkflowsRepoNode,
5-
getWorkflowNodes,
6-
} from "./workflows/workflowsRepoNode";
3+
import { WorkflowsRepoNode, getWorkflowNodes } from "./workflows/workflowsRepoNode";
74
import { log, logDebug, logError } from "../log";
85

96
import { AuthenticationNode } from "./shared/authenticationNode";
@@ -19,30 +16,24 @@ type WorkflowsTreeNode =
1916
| AuthenticationNode
2017
| NoGitHubRepositoryNode
2118
| WorkflowNode
19+
| WorkflowJobNode
2220
| WorkflowRunNode
2321
| WorkflowStepNode;
2422

25-
export class WorkflowsTreeProvider
26-
implements vscode.TreeDataProvider<WorkflowsTreeNode>
27-
{
28-
private _onDidChangeTreeData =
29-
new vscode.EventEmitter<WorkflowsTreeNode | null>();
23+
export class WorkflowsTreeProvider implements vscode.TreeDataProvider<WorkflowsTreeNode> {
24+
private _onDidChangeTreeData = new vscode.EventEmitter<WorkflowsTreeNode | null>();
3025
readonly onDidChangeTreeData = this._onDidChangeTreeData.event;
3126

3227
refresh(): void {
3328
logDebug("Refreshing workflow tree");
3429
this._onDidChangeTreeData.fire(null);
3530
}
3631

37-
getTreeItem(
38-
element: WorkflowsTreeNode
39-
): vscode.TreeItem | Thenable<vscode.TreeItem> {
32+
getTreeItem(element: WorkflowsTreeNode): vscode.TreeItem | Thenable<vscode.TreeItem> {
4033
return element;
4134
}
4235

43-
async getChildren(
44-
element?: WorkflowsTreeNode | undefined
45-
): Promise<WorkflowsTreeNode[]> {
36+
async getChildren(element?: WorkflowsTreeNode | undefined): Promise<WorkflowsTreeNode[]> {
4637
logDebug("Getting root children");
4738

4839
if (!element) {
@@ -66,11 +57,7 @@ export class WorkflowsTreeProvider
6657
} catch (e: any) {
6758
logError(e as Error, "Failed to get GitHub context");
6859

69-
if (
70-
`${e?.message}`.startsWith(
71-
"Could not get token from the GitHub authentication provider."
72-
)
73-
) {
60+
if (`${e?.message}`.startsWith("Could not get token from the GitHub authentication provider.")) {
7461
return [new AuthenticationNode()];
7562
}
7663

0 commit comments

Comments
 (0)