Skip to content

Commit 7df1be8

Browse files
jschulerjschuler
committed
prettier
1 parent daa7682 commit 7df1be8

5 files changed

+208
-236
lines changed

‎.prettierrc

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"semi": true,
3+
"singleQuote": true,
4+
"tabWidth": 2,
5+
"trailingComma": "none",
6+
"useTabs": false,
7+
"printWidth": 120
8+
}

‎src/codeFragmentsTreeItem.ts

+52-50
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,19 @@ export class CodeFragmentTreeItem extends vscode.TreeItem {
1010
public readonly children?: CodeFragmentChildTreeItem[],
1111
public readonly version?: string
1212
) {
13-
super(label, children == undefined ?
14-
vscode.TreeItemCollapsibleState.None :
15-
vscode.TreeItemCollapsibleState.Expanded);
13+
super(
14+
label,
15+
children == undefined ? vscode.TreeItemCollapsibleState.None : vscode.TreeItemCollapsibleState.Expanded
16+
);
1617
}
1718

1819
get tooltip(): string {
19-
return `${this.label}`;
20+
return `${this.label}`;
2021
}
21-
22+
2223
get description(): string {
23-
return this.version;
24-
}
24+
return this.version;
25+
}
2526

2627
contextValue = 'category';
2728
}
@@ -36,18 +37,19 @@ export class CodeFragmentGroupTreeItem extends vscode.TreeItem {
3637
public readonly children?: CodeFragmentChildTreeItem[],
3738
public readonly version?: string
3839
) {
39-
super(label, children == undefined ?
40-
vscode.TreeItemCollapsibleState.None :
41-
vscode.TreeItemCollapsibleState.Expanded);
40+
super(
41+
label,
42+
children == undefined ? vscode.TreeItemCollapsibleState.None : vscode.TreeItemCollapsibleState.Expanded
43+
);
4244
}
4345

4446
get tooltip(): string {
45-
return `${this.label}`;
47+
return `${this.label}`;
4648
}
47-
49+
4850
get description(): string {
49-
return '';
50-
}
51+
return '';
52+
}
5153

5254
contextValue = 'group';
5355
}
@@ -63,24 +65,24 @@ export class CodeFragmentChildTreeItem extends vscode.TreeItem {
6365
}
6466

6567
get tooltip(): string {
66-
return `${this.label}`;
68+
return `${this.label}`;
6769
}
68-
70+
6971
get description(): string {
70-
return '';
71-
}
72+
return '';
73+
}
7274

7375
contextValue = 'component';
7476
}
7577

7678
export class CodeFragmentProvider implements vscode.TreeDataProvider<CodeFragmentTreeItem> {
77-
private onDidChangeTreeDataEmitter: vscode.EventEmitter<CodeFragmentTreeItem | undefined> =
78-
new vscode.EventEmitter<CodeFragmentTreeItem | undefined>();
79-
public readonly onDidChangeTreeData: vscode.Event<CodeFragmentTreeItem | undefined> = this.onDidChangeTreeDataEmitter.event;
79+
private onDidChangeTreeDataEmitter: vscode.EventEmitter<CodeFragmentTreeItem | undefined> = new vscode.EventEmitter<
80+
CodeFragmentTreeItem | undefined
81+
>();
82+
public readonly onDidChangeTreeData: vscode.Event<CodeFragmentTreeItem | undefined> = this.onDidChangeTreeDataEmitter
83+
.event;
8084

81-
constructor(
82-
private readonly fragmentManager: IFragmentManager
83-
) {
85+
constructor(private readonly fragmentManager: IFragmentManager) {
8486
fragmentManager.onFragmentsChanged(() => this.onDidChangeTreeDataEmitter.fire());
8587
}
8688

@@ -90,39 +92,39 @@ export class CodeFragmentProvider implements vscode.TreeDataProvider<CodeFragmen
9092

9193
public getChildren(element?: CodeFragmentTreeItem): Thenable<CodeFragmentTreeItem[]> {
9294
if (!element) {
93-
return Promise.resolve(this.fragmentManager.getAllFragments().map(f =>
94-
new CodeFragmentTreeItem(
95-
f.category,
96-
f.id,
97-
vscode.TreeItemCollapsibleState.Collapsed,
98-
null,
99-
f.codeFragments.map(group =>
100-
new CodeFragmentGroupTreeItem(
95+
return Promise.resolve(
96+
this.fragmentManager.getAllFragments().map(
97+
f =>
98+
new CodeFragmentTreeItem(
10199
f.category,
102-
group.group,
103-
group.id,
100+
f.id,
104101
vscode.TreeItemCollapsibleState.Collapsed,
105102
null,
106-
group.children.map(ch =>
107-
new CodeFragmentChildTreeItem(
108-
ch.label,
109-
ch.id,
110-
vscode.TreeItemCollapsibleState.None,
111-
{
112-
arguments: [ch.id],
113-
command: 'codeFragments.insertCodeFragment',
114-
title: 'Insert Code Fragment',
115-
tooltip: 'Insert Code Fragment' //can put component tooltip here maybe???
116-
}
117-
)
103+
f.codeFragments.map(
104+
group =>
105+
new CodeFragmentGroupTreeItem(
106+
f.category,
107+
group.group,
108+
group.id,
109+
vscode.TreeItemCollapsibleState.Collapsed,
110+
null,
111+
group.children.map(
112+
ch =>
113+
new CodeFragmentChildTreeItem(ch.label, ch.id, vscode.TreeItemCollapsibleState.None, {
114+
arguments: [ch.id],
115+
command: 'codeFragments.insertCodeFragment',
116+
title: 'Insert Code Fragment',
117+
tooltip: 'Insert Code Fragment' //can put component tooltip here maybe???
118+
})
119+
),
120+
this.fragmentManager.getVersion()
121+
)
118122
),
119123
this.fragmentManager.getVersion()
120124
)
121-
),
122-
this.fragmentManager.getVersion()
123125
)
124-
));
125-
}
126+
);
127+
}
126128
return Promise.resolve(element.children);
127129
}
128130
}

‎src/extension.ts

+47-90
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
"use strict";
2-
import * as vscode from "vscode";
3-
import {
4-
CodeFragmentProvider,
5-
CodeFragmentGroupTreeItem
6-
} from "./codeFragmentsTreeItem";
7-
import { FragmentManager } from "./fragmentManager";
8-
import { SnippetCompletionItemProvider, addAutoImport } from "./snippetLoader";
1+
'use strict';
2+
import * as vscode from 'vscode';
3+
import { CodeFragmentProvider, CodeFragmentGroupTreeItem } from './codeFragmentsTreeItem';
4+
import { FragmentManager } from './fragmentManager';
5+
import { SnippetCompletionItemProvider, addAutoImport } from './snippetLoader';
96

107
export async function activate(context: vscode.ExtensionContext) {
118
const fragmentManager = new FragmentManager(context);
129
const codeFragmentProvider = new CodeFragmentProvider(fragmentManager);
1310

1411
const additionalEdits = (editBuilder: vscode.TextEditorEdit, label: string) => {
15-
const { leadingControlChars, importPosition, match, lastMatchingIndex } = addAutoImport(vscode.window.activeTextEditor.document);
12+
const { leadingControlChars, importPosition, match, lastMatchingIndex } = addAutoImport(
13+
vscode.window.activeTextEditor.document
14+
);
1615
if (match.indexOf(label) === -1) {
1716
// we do not have the import, need to insert it
1817
if (lastMatchingIndex === -1) {
@@ -21,34 +20,30 @@ export async function activate(context: vscode.ExtensionContext) {
2120
editBuilder.insert(importPosition, leadingControlChars ? `${leadingControlChars}${label},` : ` ${label}, `);
2221
}
2322
}
24-
}
23+
};
2524

2625
const insertCodeFragment = fragmentId => {
2726
if (!fragmentId) {
2827
vscode.window.showInformationMessage(
29-
"Insert a code fragment into the editor by clicking on it in the Code Fragments view."
28+
'Insert a code fragment into the editor by clicking on it in the Code Fragments view.'
3029
);
3130
}
3231

3332
const editor = vscode.window.activeTextEditor;
3433
if (!editor) {
35-
vscode.window.showInformationMessage(
36-
"Open a file in the editor to insert a fragment."
37-
);
34+
vscode.window.showInformationMessage('Open a file in the editor to insert a fragment.');
3835
return;
3936
}
4037

4138
const content = fragmentManager.getFragmentContent(fragmentId);
4239

4340
if (content) {
4441
// new SnippetCompletionItemProvider().provideCompletionItems();
45-
vscode.window.activeTextEditor.insertSnippet(
46-
new vscode.SnippetString(content.content)
47-
).then(() => {
48-
const config = vscode.workspace.getConfiguration("codeFragments");
49-
const autoImport: boolean = config.get("autoImport");
42+
vscode.window.activeTextEditor.insertSnippet(new vscode.SnippetString(content.content)).then(() => {
43+
const config = vscode.workspace.getConfiguration('codeFragments');
44+
const autoImport: boolean = config.get('autoImport');
5045
if (autoImport) {
51-
vscode.window.activeTextEditor.edit((editBuilder) => additionalEdits(editBuilder, content.label));
46+
vscode.window.activeTextEditor.edit(editBuilder => additionalEdits(editBuilder, content.label));
5247
}
5348
});
5449
}
@@ -60,17 +55,14 @@ export async function activate(context: vscode.ExtensionContext) {
6055

6156
const gotoDocumentation = (group: CodeFragmentGroupTreeItem) => {
6257
if (!group) {
63-
vscode.window.showInformationMessage("Nothing passed");
58+
vscode.window.showInformationMessage('Nothing passed');
6459
}
65-
const url = `${
66-
group.category.toLowerCase() === "beta" ? "experimental" : group.category
67-
}/${group.label}`.toLowerCase();
60+
const url = `${group.category.toLowerCase() === 'beta' ? 'experimental' : group.category}/${
61+
group.label
62+
}`.toLowerCase();
6863
// console.info(`https://www.patternfly.org/${group.version || 'v4'}/documentation/react/${url}`);
6964
vscode.env.openExternal(
70-
vscode.Uri.parse(
71-
`https://www.patternfly.org/${group.version ||
72-
"v4"}/documentation/react/${url}`
73-
)
65+
vscode.Uri.parse(`https://www.patternfly.org/${group.version || 'v4'}/documentation/react/${url}`)
7466
);
7567
};
7668

@@ -89,101 +81,66 @@ export async function activate(context: vscode.ExtensionContext) {
8981
};
9082

9183
const onUpdateConfiguration = (event: vscode.ConfigurationChangeEvent) => {
92-
if (event.affectsConfiguration("codeFragments")) {
93-
const config = vscode.workspace.getConfiguration("codeFragments");
94-
fragmentManager.toggleCommentsInFragments(
95-
config.get("includeCommentsInFragment")
96-
);
97-
fragmentManager.toggleAutoImport(
98-
config.get("autoImport")
99-
);
100-
fragmentManager.updateVersionUsed(config.get("patternflyRelease"));
84+
if (event.affectsConfiguration('codeFragments')) {
85+
const config = vscode.workspace.getConfiguration('codeFragments');
86+
fragmentManager.toggleCommentsInFragments(config.get('includeCommentsInFragment'));
87+
fragmentManager.toggleAutoImport(config.get('autoImport'));
88+
fragmentManager.updateVersionUsed(config.get('patternflyRelease'));
10189
fragmentManager.reimportDefaults();
10290
}
10391
};
10492

10593
fragmentManager.initialize();
10694

107-
vscode.window.registerTreeDataProvider("codeFragments", codeFragmentProvider);
95+
vscode.window.registerTreeDataProvider('codeFragments', codeFragmentProvider);
10896

10997
vscode.workspace.onDidChangeConfiguration(onUpdateConfiguration);
11098

99+
context.subscriptions.push(vscode.commands.registerCommand('codeFragments.insertCodeFragment', insertCodeFragment));
100+
context.subscriptions.push(vscode.commands.registerCommand('codeFragments.refreshFragments', refreshFragments));
101+
context.subscriptions.push(vscode.commands.registerCommand('codeFragments.gotoDocumentation', gotoDocumentation));
111102
context.subscriptions.push(
112-
vscode.commands.registerCommand(
113-
"codeFragments.insertCodeFragment",
114-
insertCodeFragment
115-
)
103+
vscode.commands.registerCommand('codeFragments.toggleCommentsInFragments', toggleCommentsInFragments)
116104
);
105+
context.subscriptions.push(vscode.commands.registerCommand('codeFragments.autoImportCommand', toggleAutoImport));
117106
context.subscriptions.push(
118-
vscode.commands.registerCommand(
119-
"codeFragments.refreshFragments",
120-
refreshFragments
121-
)
107+
vscode.commands.registerCommand('codeFragments.switchVersion_2020.02', () => switchVersion('2020.02'))
122108
);
123109
context.subscriptions.push(
124-
vscode.commands.registerCommand(
125-
"codeFragments.gotoDocumentation",
126-
gotoDocumentation
127-
)
110+
vscode.commands.registerCommand('codeFragments.switchVersion_2020.01', () => switchVersion('2020.01'))
128111
);
129112
context.subscriptions.push(
130-
vscode.commands.registerCommand(
131-
"codeFragments.toggleCommentsInFragments",
132-
toggleCommentsInFragments
133-
)
113+
vscode.commands.registerCommand('codeFragments.switchVersion_2019.11', () => switchVersion('2019.11'))
134114
);
135115
context.subscriptions.push(
136-
vscode.commands.registerCommand(
137-
"codeFragments.autoImportCommand",
138-
toggleAutoImport
139-
)
140-
);
141-
context.subscriptions.push(
142-
vscode.commands.registerCommand("codeFragments.switchVersion_2020.02", () =>
143-
switchVersion("2020.02")
144-
)
145-
);
146-
context.subscriptions.push(
147-
vscode.commands.registerCommand("codeFragments.switchVersion_2020.01", () =>
148-
switchVersion("2020.01")
149-
)
150-
);
151-
context.subscriptions.push(
152-
vscode.commands.registerCommand("codeFragments.switchVersion_2019.11", () =>
153-
switchVersion("2019.11")
154-
)
155-
);
156-
context.subscriptions.push(
157-
vscode.commands.registerCommand("codeFragments.switchVersion_2019.10", () =>
158-
switchVersion("2019.10")
159-
)
116+
vscode.commands.registerCommand('codeFragments.switchVersion_2019.10', () => switchVersion('2019.10'))
160117
);
161118

162119
// push these 2 subscriptions last
163-
const config = vscode.workspace.getConfiguration("codeFragments");
164-
const release: string = config.get("patternflyRelease");
165-
const autoImport: boolean = config.get("autoImport");
120+
const config = vscode.workspace.getConfiguration('codeFragments');
121+
const release: string = config.get('patternflyRelease');
122+
const autoImport: boolean = config.get('autoImport');
166123
const languageSelectors: vscode.DocumentSelector = [
167-
"typescript",
168-
"typescriptreact",
169-
"javascript",
170-
"javascriptreact",
171-
"html",
172-
"plaintext",
173-
"markdown"
124+
'typescript',
125+
'typescriptreact',
126+
'javascript',
127+
'javascriptreact',
128+
'html',
129+
'plaintext',
130+
'markdown'
174131
];
175132
context.subscriptions.push(
176133
vscode.languages.registerCompletionItemProvider(
177134
languageSelectors,
178135
new SnippetCompletionItemProvider(release, true, autoImport),
179-
"#"
136+
'#'
180137
)
181138
);
182139
context.subscriptions.push(
183140
vscode.languages.registerCompletionItemProvider(
184141
languageSelectors,
185142
new SnippetCompletionItemProvider(release, false, autoImport),
186-
"!"
143+
'!'
187144
)
188145
);
189146
}

0 commit comments

Comments
 (0)