Skip to content

Commit 83d9f12

Browse files
BoxBoxJasonBoxBoxJason
committed
style: apply code formatters
1 parent 65d3e01 commit 83d9f12

34 files changed

+1932
-1393
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ dist/
33
node_modules/
44
author.sh
55
*.vsix
6+
.vscode-test/

‎.vscode-test.mjs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { defineConfig } from '@vscode/test-cli';
1+
import { defineConfig } from "@vscode/test-cli";
22

33
export default defineConfig({
4-
files: 'out/test/**/*.test.js',
4+
files: "out/test/**/*.test.js",
55
});

‎esbuild.ts‎

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
1-
import { constants } from './src/constants';
2-
import * as esbuild from 'esbuild';
3-
import * as fs from 'fs-extra';
1+
import { constants } from "./src/constants";
2+
import * as esbuild from "esbuild";
43

5-
const production = process.argv.includes('--production');
4+
const production = process.argv.includes("--production");
65
/**
76
* An esbuild plugin to match and log problems during the build.
87
* @type {esbuild.Plugin}
98
*/
109
const esbuildProblemMatcherPlugin: esbuild.Plugin = {
11-
name: 'esbuild-problem-matcher',
10+
name: "esbuild-problem-matcher",
1211
setup(build: esbuild.PluginBuild) {
1312
build.onStart(() => {
14-
console.log('build started');
13+
console.log("build started");
1514
});
1615
build.onEnd((result) => {
1716
result.errors.forEach(({ text, location }) => {
1817
console.error(`✘ [ERROR] ${text}`);
1918
if (location) {
20-
console.error(` ${location.file}:${location.line}:${location.column}:`);
19+
console.error(
20+
` ${location.file}:${location.line}:${location.column}:`
21+
);
2122
}
2223
});
23-
console.log('build finished');
24+
console.log("build finished");
2425
});
2526
},
2627
};
@@ -30,32 +31,28 @@ async function main() {
3031
const ctxWebview = await esbuild.context({
3132
entryPoints: [...constants.build.WEBVIEW_ENTRYPOINTS],
3233
bundle: true,
33-
format: 'iife', // Output format suitable for webviews
34+
format: "iife", // Output format suitable for webviews
3435
minify: production,
3536
sourcemap: !production,
36-
platform: 'browser',
37+
platform: "browser",
3738
outfile: constants.build.WEBVIEW_OUT_FILE,
38-
logLevel: 'silent',
39-
plugins: [
40-
esbuildProblemMatcherPlugin,
41-
],
39+
logLevel: "silent",
40+
plugins: [esbuildProblemMatcherPlugin],
4241
});
4342

4443
// Build for main extension
4544
const ctxExtension = await esbuild.context({
4645
entryPoints: [...constants.build.EXTENSION_ENTRYPOINTS],
4746
bundle: true,
48-
format: 'cjs',
47+
format: "cjs",
4948
minify: production,
5049
sourcemap: !production,
5150
sourcesContent: false,
52-
platform: 'node',
51+
platform: "node",
5352
outfile: constants.build.EXTENSION_OUT_FILE,
54-
external: ['vscode', 'better-sqlite3'],
55-
logLevel: 'silent',
56-
plugins: [
57-
esbuildProblemMatcherPlugin,
58-
],
53+
external: ["vscode", "better-sqlite3"],
54+
logLevel: "silent",
55+
plugins: [esbuildProblemMatcherPlugin],
5956
});
6057

6158
// Single builds
@@ -65,8 +62,7 @@ async function main() {
6562
await ctxExtension.dispose();
6663
}
6764

68-
69-
main().catch(e => {
65+
main().catch((e) => {
7066
console.error(e);
7167
process.exit(1);
72-
});
68+
});

‎eslint.config.mjs‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,34 @@
11
import typescriptEslint from "@typescript-eslint/eslint-plugin";
22
import tsParser from "@typescript-eslint/parser";
33

4-
export default [{
4+
export default [
5+
{
56
files: ["**/*.ts"],
6-
}, {
7+
},
8+
{
79
plugins: {
8-
"@typescript-eslint": typescriptEslint,
10+
"@typescript-eslint": typescriptEslint,
911
},
1012

1113
languageOptions: {
12-
parser: tsParser,
13-
ecmaVersion: 2022,
14-
sourceType: "module",
14+
parser: tsParser,
15+
ecmaVersion: 2022,
16+
sourceType: "module",
1517
},
1618

1719
rules: {
18-
"@typescript-eslint/naming-convention": ["warn", {
19-
selector: "import",
20-
format: ["camelCase", "PascalCase"],
21-
}],
20+
"@typescript-eslint/naming-convention": [
21+
"warn",
22+
{
23+
selector: "import",
24+
format: ["camelCase", "PascalCase"],
25+
},
26+
],
2227

23-
curly: "warn",
24-
eqeqeq: "warn",
25-
"no-throw-literal": "warn",
26-
semi: "warn",
28+
curly: "warn",
29+
eqeqeq: "warn",
30+
"no-throw-literal": "warn",
31+
semi: "warn",
2732
},
28-
}];
33+
},
34+
];

‎src/config/config.ts‎

Lines changed: 69 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ export interface Config {
2727
tabs: boolean;
2828
tasks: boolean;
2929
time: boolean;
30-
}
30+
};
3131
}
3232

3333
// ==================== VARIABLES ====================
34-
let defaultLogDir : string = '';
34+
let defaultLogDir: string = "";
3535

3636
// ==================== MODULE FUNCTIONS ====================
3737
/**
@@ -48,7 +48,6 @@ let defaultLogDir : string = '';
4848
* @function toggleNotifications - Toggles the notifications
4949
*/
5050
export namespace config {
51-
5251
/**
5352
* Initializes the config module
5453
*
@@ -59,7 +58,7 @@ export namespace config {
5958
* @returns {void}
6059
*/
6160
export function activate(context: vscode.ExtensionContext): void {
62-
defaultLogDir = path.join(context.globalStorageUri.fsPath, 'logs');
61+
defaultLogDir = path.join(context.globalStorageUri.fsPath, "logs");
6362

6463
const config = getConfig();
6564
logger.setLogLevel(config.logLevel);
@@ -80,22 +79,28 @@ export namespace config {
8079
* @returns {void}
8180
*/
8281
function handleSetUsername() {
83-
vscode.window.showInformationMessage('For a better experience, please set your username', 'Set Username').then((selection) => {
84-
if (selection === 'Set Username') {
85-
vscode.window.showInputBox({
86-
prompt: 'Enter your username',
87-
placeHolder: webview.DEFAULT_USER,
88-
validateInput: (input) => {
89-
return input.trim() ? null : 'Username cannot be empty';
90-
}
91-
})
92-
.then((username) => {
93-
if (username) {
94-
setUsername(username);
95-
}
96-
});
97-
}
98-
});
82+
vscode.window
83+
.showInformationMessage(
84+
"For a better experience, please set your username",
85+
"Set Username"
86+
)
87+
.then((selection) => {
88+
if (selection === "Set Username") {
89+
vscode.window
90+
.showInputBox({
91+
prompt: "Enter your username",
92+
placeHolder: webview.DEFAULT_USER,
93+
validateInput: (input) => {
94+
return input.trim() ? null : "Username cannot be empty";
95+
},
96+
})
97+
.then((username) => {
98+
if (username) {
99+
setUsername(username);
100+
}
101+
});
102+
}
103+
});
99104
}
100105

101106
/**
@@ -108,35 +113,47 @@ export namespace config {
108113
* @throws {Error} - If the module has not been initialized
109114
*/
110115
export function getConfig(): Readonly<Config> {
111-
const extensionRawConfig = vscode.workspace.getConfiguration('achievements');
112-
let extensionConfig : Config = {
113-
enabled: extensionRawConfig.get<boolean>('enabled', true),
114-
logLevel: extensionRawConfig.get<string>('logLevel', 'info'),
115-
notifications: extensionRawConfig.get<boolean>('notifications', true),
116-
logDirectory: extensionRawConfig.get<string>('logDirectory', defaultLogDir).trim(),
117-
username: extensionRawConfig.get<string>('username', webview.DEFAULT_USER).trim(),
116+
const extensionRawConfig =
117+
vscode.workspace.getConfiguration("achievements");
118+
let extensionConfig: Config = {
119+
enabled: extensionRawConfig.get<boolean>("enabled", true),
120+
logLevel: extensionRawConfig.get<string>("logLevel", "info"),
121+
notifications: extensionRawConfig.get<boolean>("notifications", true),
122+
logDirectory: extensionRawConfig
123+
.get<string>("logDirectory", defaultLogDir)
124+
.trim(),
125+
username: extensionRawConfig
126+
.get<string>("username", webview.DEFAULT_USER)
127+
.trim(),
118128
listeners: {
119-
debug: extensionRawConfig.get<boolean>('listeners.debug', true),
120-
extensions: extensionRawConfig.get<boolean>('listeners.extensions', true),
121-
files: extensionRawConfig.get<boolean>('listeners.files', true),
122-
git: extensionRawConfig.get<boolean>('listeners.git', true),
123-
tabs: extensionRawConfig.get<boolean>('listeners.tabs', true),
124-
tasks: extensionRawConfig.get<boolean>('listeners.tasks', true),
125-
time: extensionRawConfig.get<boolean>('listeners.time', true)
126-
}
129+
debug: extensionRawConfig.get<boolean>("listeners.debug", true),
130+
extensions: extensionRawConfig.get<boolean>(
131+
"listeners.extensions",
132+
true
133+
),
134+
files: extensionRawConfig.get<boolean>("listeners.files", true),
135+
git: extensionRawConfig.get<boolean>("listeners.git", true),
136+
tabs: extensionRawConfig.get<boolean>("listeners.tabs", true),
137+
tasks: extensionRawConfig.get<boolean>("listeners.tasks", true),
138+
time: extensionRawConfig.get<boolean>("listeners.time", true),
139+
},
127140
};
128-
141+
129142
// Check if the log directory is a valid path, if not, set it to the default
130-
if ( !path.isAbsolute(extensionConfig.logDirectory) ) {
131-
logger.warn(`Invalid log directory path: ${extensionConfig.logDirectory}, setting to default`);
132-
updateConfig('logDirectory', defaultLogDir);
143+
if (!path.isAbsolute(extensionConfig.logDirectory)) {
144+
logger.warn(
145+
`Invalid log directory path: ${extensionConfig.logDirectory}, setting to default`
146+
);
147+
updateConfig("logDirectory", defaultLogDir);
133148
extensionConfig.logDirectory = defaultLogDir;
134149
}
135150
try {
136151
fs.mkdirSync(extensionConfig.logDirectory, { recursive: true });
137152
} catch (error) {
138-
logger.error(`Error creating log directory: ${error}, setting to default`);
139-
updateConfig('logDirectory', defaultLogDir);
153+
logger.error(
154+
`Error creating log directory: ${error}, setting to default`
155+
);
156+
updateConfig("logDirectory", defaultLogDir);
140157
extensionConfig.logDirectory = defaultLogDir;
141158
}
142159
return extensionConfig;
@@ -155,9 +172,9 @@ export namespace config {
155172
export function enableExtension(): void {
156173
const config = getConfig();
157174
const enabled = !config.enabled;
158-
updateConfig('enabled', enabled);
175+
updateConfig("enabled", enabled);
159176

160-
let enabledString = enabled ? 'enabled' : 'disabled';
177+
let enabledString = enabled ? "enabled" : "disabled";
161178
let enabledMessage = `Achievement ${enabledString}!`;
162179
logger.info(enabledMessage);
163180
vscode.window.showInformationMessage(enabledMessage);
@@ -189,10 +206,10 @@ export namespace config {
189206
export function setUsername(username: string): void {
190207
username = username.trim();
191208
if (!username) {
192-
logger.error('Username cannot be empty');
193-
throw new Error('username cannot be empty');
209+
logger.error("Username cannot be empty");
210+
throw new Error("username cannot be empty");
194211
}
195-
updateConfig('username', username);
212+
updateConfig("username", username);
196213
logger.info(`Username set to: ${username}`);
197214
}
198215

@@ -209,20 +226,21 @@ export namespace config {
209226
return getConfig().username;
210227
}
211228

212-
function updateConfig(key : string, value : any) {
213-
const config = vscode.workspace.getConfiguration('achievements');
229+
function updateConfig(key: string, value: any) {
230+
const config = vscode.workspace.getConfiguration("achievements");
214231
config.update(key, value, vscode.ConfigurationTarget.Global);
215232
}
216233

217-
export function isListenerEnabled(listener: keyof Config["listeners"]): boolean {
234+
export function isListenerEnabled(
235+
listener: keyof Config["listeners"]
236+
): boolean {
218237
const listeners = getConfig().listeners;
219-
238+
220239
if (listener in listeners) {
221240
return listeners[listener];
222241
} else {
223242
logger.warn(`Listener "${listener}" does not exist`);
224243
return false;
225244
}
226245
}
227-
228246
}

0 commit comments

Comments
 (0)