Skip to content

Commit ac1727d

Browse files
BernardXiongBernardXiong
committed
修正代码规范，确保符合TS的规范
1 parent 737533c commit ac1727d

File tree

9 files changed

+53
-43
lines changed

9 files changed

+53
-43
lines changed

‎src/api.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ export function writeJsonObject(jsonObject: any, fn:string) {
147147
export async function openFolder(uri?: string) {
148148
let selectedFolder:vscode.Uri[] | undefined;
149149

150-
if (uri != undefined) {
150+
if (uri !== undefined) {
151151
selectedFolder = await vscode.window.showOpenDialog({
152152
defaultUri: vscode.Uri.file(uri),
153153
canSelectFolders: true,

‎src/dock.ts‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import path from 'path';
1+
import path from 'path';
22
import * as vscode from 'vscode';
33
import os from 'os';
44
import fs from 'fs';
@@ -195,11 +195,11 @@ class GroupsDataProvider implements vscode.TreeDataProvider<ProjectTreeItem> {
195195
if (treeElement) {
196196
if (treeElement.length > 0) {
197197
}
198-
else if (element.contextType == "project_folder") {
198+
else if (element.contextType === "project_folder") {
199199
listFolderTreeItem(element);
200200
}
201201
}
202-
else if (element.contextType == "project_folder") {
202+
else if (element.contextType === "project_folder") {
203203
listFolderTreeItem(element);
204204
}
205205
children = element.children;
@@ -246,11 +246,11 @@ class ProjectFilesDataProvider implements vscode.TreeDataProvider<ProjectTreeIte
246246
if (treeElement) {
247247
if (treeElement.length > 0) {
248248
}
249-
else if (element.contextType == "project_folder") {
249+
else if (element.contextType === "project_folder") {
250250
listFolderTreeItem(element);
251251
}
252252
}
253-
else if (element.contextType == "project_folder") {
253+
else if (element.contextType === "project_folder") {
254254
listFolderTreeItem(element);
255255
}
256256
children = element.children;
@@ -360,3 +360,4 @@ export function initDockView(context: vscode.ExtensionContext) {
360360
const treeDataprovider = new CmdTreeDataProvider();
361361
context.subscriptions.push(vscode.window.registerTreeDataProvider("treeId", treeDataprovider));
362362
}
363+

‎src/project/tree.ts‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import path from 'path';
1+
import path from 'path';
22
import * as vscode from 'vscode';
33
import fs from 'fs';
44
import { getWorkspaceFolder, getExtensionPath } from '../api';
@@ -52,7 +52,7 @@ export class ProjectTreeItem extends vscode.TreeItem {
5252
}
5353
}
5454

55-
if (contextType == 'project_file') {
55+
if (contextType === 'project_file') {
5656
this.command = {
5757
title: this.name,
5858
command: 'extension.clickProject',
@@ -62,7 +62,7 @@ export class ProjectTreeItem extends vscode.TreeItem {
6262
]
6363
};
6464
}
65-
else if (contextType == 'project_bsp') {
65+
else if (contextType === 'project_bsp') {
6666
this.command = {
6767
title: this.name,
6868
command: 'extension.handleTreeItemClick',
@@ -99,7 +99,7 @@ export function getTreeIcon(isDir: boolean, value: string): string {
9999
if (isDir) {
100100
icon = "default_folder.svg";
101101
} else {
102-
if (value == "project") {
102+
if (value === "project") {
103103
icon = "chip";
104104
}
105105
else if (value.endsWith(".c")) {
@@ -109,7 +109,7 @@ export function getTreeIcon(isDir: boolean, value: string): string {
109109
} else if (value.endsWith(".h")) {
110110
icon = "file_type_cheader.svg";
111111
} else if (value.endsWith(".s") || value.endsWith(".S")) {
112-
icon = "file_type_assembly.png"
112+
icon = "file_type_assembly.png";
113113
} else if (value.endsWith(".py") || value.endsWith("SConscript") || value.endsWith("SConstruct")) {
114114
icon = "file_type_python.svg";
115115
} else if (value.endsWith(".txt")) {
@@ -304,7 +304,7 @@ export function listStarsTreeItem(bspFolder:string, node: any) {
304304
let items = item.split(/[\/\\]/);
305305
if (items.length >= 2) {
306306
for (let i = 0; i < children.length; i++) {
307-
if (children[i].label == items[0]) {
307+
if (children[i].label === items[0]) {
308308
parent = children[i].children;
309309
break;
310310
}
@@ -360,7 +360,7 @@ export function initProjectTree(context:vscode.ExtensionContext) {
360360
}
361361

362362
// double clicked
363-
if (currentSelectedBspItem && currentSelectedBspItem.fn != item.fn) {
363+
if (currentSelectedBspItem && currentSelectedBspItem.fn !== item.fn) {
364364
DecorationProvider.getInstance().unmarkFile(vscode.Uri.file(currentSelectedBspItem.fn));
365365
}
366366

@@ -388,3 +388,4 @@ export function initProjectTree(context:vscode.ExtensionContext) {
388388
export function setTreeDataChangeEmitter(emitter: vscode.EventEmitter<ProjectTreeItem | undefined>) {
389389
_onDidChangeTreeData = emitter;
390390
}
391+

‎src/utils/elf/dwarf-parser.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as fs from 'fs';
1+
import * as fs from 'fs';
22

33
interface DwarfLineInfo {
44
address: number;
@@ -45,7 +45,9 @@ export class DwarfParser {
4545
}
4646

4747
private parseDebugLine(): void {
48-
if (!this.debugLineSection) return;
48+
if (!this.debugLineSection) {
49+
return;
50+
}
4951

5052
let offset = 0;
5153
const section = this.debugLineSection;
@@ -401,4 +403,4 @@ export class DwarfParser {
401403
public getAllLineInfo(): Map<number, DwarfLineInfo> {
402404
return this.lineInfoMap;
403405
}
404-
}
406+
}

‎src/utils/elf/map-parser.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as fs from 'fs';
1+
import * as fs from 'fs';
22
import { Symbol } from './types';
33

44
export class MapParser {
@@ -22,7 +22,9 @@ export class MapParser {
2222
continue;
2323
}
2424

25-
if (!inSymbolSection) continue;
25+
if (!inSymbolSection) {
26+
continue;
27+
}
2628

2729
// Parse object file name
2830
const objectMatch = line.match(/^\..*?\s+0x[0-9a-f]+\s+0x[0-9a-f]+\s+(.+\.o)/i);
@@ -112,4 +114,4 @@ export class MapParser {
112114

113115
return Array.from(mergedMap.values()).sort((a, b) => b.size - a.size);
114116
}
115-
}
117+
}

‎src/venv.ts‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
import * as vscode from 'vscode';
1+
import * as vscode from 'vscode';
22
import * as os from 'os';
33
import * as path from 'path';
44
import * as fs from 'fs';
55

66
export async function setupVEnv() {
7-
let pythonExtensionId = 'ms-python.python';
8-
let pythonExtension = vscode.extensions.getExtension(pythonExtensionId);
7+
const pythonExtensionId = 'ms-python.python';
8+
const pythonExtension = vscode.extensions.getExtension(pythonExtensionId);
99
if (!pythonExtension) {
10-
vscode.window.showErrorMessage(`Python extension not found. Please install it first.`);
10+
vscode.window.showErrorMessage('Python extension not found. Please install it first.');
1111
return;
1212
}
1313

1414
const api = pythonExtension.activate();
15-
api.then(async (exportApi:any) => {
15+
api.then(async (exportApi: any) => {
1616
if (exportApi) {
17-
let homeDir = os.homedir();
18-
const venvPath = path.join(homeDir, ".env", ".venv");
17+
const homeDir = os.homedir();
18+
const venvPath = path.join(homeDir, '.env', '.venv');
1919

2020
if (fs.existsSync(venvPath) && fs.lstatSync(venvPath).isDirectory()) {
21-
let pythonPath = path.join(venvPath, "bin", "python");
21+
let pythonPath = path.join(venvPath, 'bin', 'python');
2222
if (!fs.existsSync(pythonPath)) {
23-
pythonPath = path.join(venvPath, "Scripts", "python.exe");
23+
pythonPath = path.join(venvPath, 'Scripts', 'python.exe');
2424
}
25-
25+
2626
try {
2727
await exportApi.environments.updateActiveEnvironmentPath(pythonPath);
2828
} catch (error) {
2929
vscode.window.showErrorMessage(`Active venv failed: ${error}`);
3030
}
31-
}
31+
}
3232
}
33-
})
33+
});
3434
}

‎src/vue/env.d.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
/// <reference types="vite/client" />
1+
/// <reference types="vite/client" />
22

33
declare module '*.vue' {
4-
import type { DefineComponent } from 'vue'
5-
const component: DefineComponent<{}, {}, any>
6-
export default component
4+
import type { DefineComponent } from 'vue';
5+
const component: DefineComponent<{}, {}, any>;
6+
export default component;
77
}

‎src/webviews/project.ts‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as vscode from 'vscode';
1+
import * as vscode from 'vscode';
22
import * as path from 'path';
33
import * as fs from 'fs';
44
import { getWorkspaceFolder } from '../api';
@@ -24,12 +24,13 @@ async function findRtconfigDirectories(bspDir: string): Promise<TreeNode[]> {
2424
const root:TreeNode[] = [];
2525

2626
async function searchDir(dir: string): Promise<void> {
27-
let parent:any = undefined
27+
let parent:any = undefined;
2828
const entries = await fs.promises.readdir(dir, { withFileTypes: true });
2929

3030
for (const entry of entries) {
31-
if (entry.name.includes('template'))
31+
if (entry.name.includes('template')) {
3232
continue; // Skip directories containing 'template'
33+
}
3334

3435
if (entry.isDirectory()) {
3536
const fullPath = path.join(dir, entry.name);
@@ -47,17 +48,17 @@ async function findRtconfigDirectories(bspDir: string): Promise<TreeNode[]> {
4748
// rename the node name
4849
node.name = items.slice(1, items.length).join(path.sep);
4950

50-
if (parent == undefined) {
51+
if (parent === undefined) {
5152
// search for the parent node in the root array
5253
for (let i = 0; i < root.length; i++) {
53-
if (root[i].name == items[0]) {
54+
if (root[i].name === items[0]) {
5455
parent = root[i];
5556
break;
5657
}
5758
}
5859

5960
// not found, create a new parent node
60-
if (parent == undefined) {
61+
if (parent === undefined) {
6162
const parent_node : TreeNode = {
6263
id: "" + Math.random().toString(36).substring(2, 15),
6364
name: items[0],

‎src/webviews/settings_env.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,8 +277,11 @@ export async function deleteEnvFunction(webview: vscode.Webview) {
277277
async function deleteDirRecursive(dirPath: string): Promise<void> {
278278
return new Promise((resolve, reject) => {
279279
fs.rm(dirPath, { recursive: true, force: true }, (err) => {
280-
if (err) reject(err);
281-
else resolve();
280+
if (err) {
281+
reject(err);
282+
} else {
283+
resolve();
284+
}
282285
});
283286
});
284287
}

0 commit comments

Comments
 (0)