Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@
"@vscode/test-electron": "^2.4.1",
"@vscode/vsce": "^3.2.1",
"esbuild": "^0.28.1",
"eslint": "^9.13.0",
"eslint": "^10.6.0",
"mocha": "^11.0.1",
"prettier": "^3.9.3",
"rimraf": "^6.0.1",
Expand Down
247 changes: 88 additions & 159 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/adapter/advanced-commands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export function registerAdvancedCommands(service: GitRepositoryService, branches
}
const headName = repo.state.HEAD?.name;
const base = headName ?? 'main';
let merged: string[] = [];
let merged: string[];
try {
const out = await service.execGit(['branch', '--merged', base]);
merged = filterMergeable(out, base, headName ? [headName] : []);
Expand Down
2 changes: 1 addition & 1 deletion src/adapter/misc-commands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export function registerMiscCommands(
if (!scope) {
return;
}
let patch = '';
let patch: string;
try {
patch = await service.execGit(scope.args);
} catch (e) {
Expand Down
6 changes: 3 additions & 3 deletions src/adapter/webview/merge-editor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ export class MergeEditorWebview {
void vscode.window.showWarningMessage('未找到 Git 仓库');
return;
}
let base = '';
let ours = '';
let theirs = '';
let base: string;
let ours: string;
let theirs: string;
try {
// 并行取三阶段(冲突文件的 index stage 1/2/3)
[base, ours, theirs] = await Promise.all([
Expand Down
2 changes: 1 addition & 1 deletion src/adapter/webview/rebase-webview.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export class RebaseWebview {
const base = basePick.label;

// 获取 base..HEAD 提交(逆序 → 正序:rebase 按时间正序回放)
let rebaseCommits: RebaseCommit[] = [];
let rebaseCommits: RebaseCommit[];
try {
const out = await service.execGit(['log', '--reverse', '--format=%h|%s', `${base}..HEAD`]);
rebaseCommits = out
Expand Down
2 changes: 1 addition & 1 deletion src/adapter/worktree-commands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ export function registerWorktreeCommands(service: GitRepositoryService, worktree
return;
}
// 不静默清理:先列出 prunable 项,无则提示;有则 modal 确认(防误删网络/移动盘合法 worktree)。
let prunablePaths: string[] = [];
let prunablePaths: string[];
try {
const out = await service.execGit(['worktree', 'list', '--porcelain', '-z']);
prunablePaths = parseWorktreeList(out)
Expand Down
Loading