Compare commits
1 Commits
55df24e0fd
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| c887635a0c |
@@ -1,4 +1,4 @@
|
|||||||
import * as vscode from 'vscode';
|
import * as vscode from "vscode";
|
||||||
|
|
||||||
interface GitExtension {
|
interface GitExtension {
|
||||||
getAPI(version: number): GitAPI;
|
getAPI(version: number): GitAPI;
|
||||||
@@ -30,14 +30,14 @@ interface Change {
|
|||||||
|
|
||||||
export interface GitChange {
|
export interface GitChange {
|
||||||
path: string;
|
path: string;
|
||||||
status: 'added' | 'modified' | 'deleted' | 'renamed' | 'untracked';
|
status: "added" | "modified" | "deleted" | "renamed" | "untracked";
|
||||||
diff?: string;
|
diff?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function getGitChanges(): Promise<GitChange[]> {
|
export async function getGitChanges(): Promise<GitChange[]> {
|
||||||
const repository = await getActiveGitRepository();
|
const repository = await getActiveGitRepository();
|
||||||
if (!repository) {
|
if (!repository) {
|
||||||
throw new Error('No Git repository found');
|
throw new Error("No Git repository found");
|
||||||
}
|
}
|
||||||
|
|
||||||
const state = repository.state;
|
const state = repository.state;
|
||||||
@@ -54,8 +54,8 @@ export async function getGitChanges(): Promise<GitChange[]> {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
} else if (unstagedChanges.length > 0) {
|
} else if (unstagedChanges.length > 0) {
|
||||||
const config = vscode.workspace.getConfiguration('aiCommitExt');
|
const config = vscode.workspace.getConfiguration("aiCommitExt");
|
||||||
const includeUnstaged = config.get<boolean>('includeUnstaged', false);
|
const includeUnstaged = config.get<boolean>("includeUnstaged", false);
|
||||||
|
|
||||||
if (includeUnstaged) {
|
if (includeUnstaged) {
|
||||||
for (const change of unstagedChanges) {
|
for (const change of unstagedChanges) {
|
||||||
@@ -73,58 +73,61 @@ export async function getGitChanges(): Promise<GitChange[]> {
|
|||||||
export async function getGitDiff(): Promise<string> {
|
export async function getGitDiff(): Promise<string> {
|
||||||
const repository = await getActiveGitRepository();
|
const repository = await getActiveGitRepository();
|
||||||
if (!repository) {
|
if (!repository) {
|
||||||
throw new Error('No Git repository found');
|
throw new Error("No Git repository found");
|
||||||
}
|
}
|
||||||
|
|
||||||
const state = repository.state;
|
const state = repository.state;
|
||||||
let diffOutput = '';
|
let diffOutput = "";
|
||||||
|
|
||||||
const stagedChanges = state.indexChanges || [];
|
const stagedChanges = state.indexChanges || [];
|
||||||
const unstagedChanges = state.workingTreeChanges || [];
|
const unstagedChanges = state.workingTreeChanges || [];
|
||||||
const config = vscode.workspace.getConfiguration('aiCommitExt');
|
const config = vscode.workspace.getConfiguration("aiCommitExt");
|
||||||
const includeUnstaged = config.get<boolean>('includeUnstaged', false);
|
const includeUnstaged = config.get<boolean>("includeUnstaged", false);
|
||||||
|
|
||||||
if (stagedChanges.length > 0) {
|
if (stagedChanges.length > 0) {
|
||||||
for (const change of stagedChanges) {
|
for (const change of stagedChanges) {
|
||||||
const fileName = change.uri.fsPath.split('/').pop() || '';
|
const fileName = change.uri.fsPath.split("/").pop() || "";
|
||||||
diffOutput += `## ${fileName} (staged)\n`;
|
diffOutput += `## ${fileName} (staged)\n`;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const diff = await repository.diffIndexWithHEAD(change.uri.fsPath);
|
const diff = await repository.diffIndexWithHEAD(
|
||||||
|
change.uri.fsPath,
|
||||||
|
);
|
||||||
if (diff) {
|
if (diff) {
|
||||||
diffOutput += diff + '\n';
|
diffOutput += diff + "\n";
|
||||||
}
|
}
|
||||||
} catch {
|
} catch {
|
||||||
diffOutput += '(Unable to get diff)\n';
|
diffOutput += "(Unable to get diff)\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (unstagedChanges.length > 0 && includeUnstaged) {
|
} else if (unstagedChanges.length > 0 && includeUnstaged) {
|
||||||
for (const change of unstagedChanges) {
|
for (const change of unstagedChanges) {
|
||||||
const fileName = change.uri.fsPath.split('/').pop() || '';
|
const fileName = change.uri.fsPath.split("/").pop() || "";
|
||||||
diffOutput += `## ${fileName} (unstaged)\n`;
|
diffOutput += `## ${fileName} (unstaged)\n`;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const diff = await repository.diffWithHEAD(change.uri.fsPath);
|
const diff = await repository.diffWithHEAD(change.uri.fsPath);
|
||||||
if (diff) {
|
if (diff) {
|
||||||
diffOutput += diff + '\n';
|
diffOutput += diff + "\n";
|
||||||
}
|
}
|
||||||
} catch {
|
} catch {
|
||||||
diffOutput += '(Unable to get diff)\n';
|
diffOutput += "(Unable to get diff)\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!diffOutput) {
|
if (!diffOutput) {
|
||||||
throw new Error('No changes to commit');
|
throw new Error("No changes to commit");
|
||||||
}
|
}
|
||||||
|
|
||||||
return diffOutput;
|
return diffOutput;
|
||||||
}
|
}
|
||||||
|
|
||||||
async function getActiveGitRepository(): Promise<Repository | null> {
|
async function getActiveGitRepository(): Promise<Repository | null> {
|
||||||
const gitExtension = vscode.extensions.getExtension<GitExtension>('vscode.git');
|
const gitExtension =
|
||||||
|
vscode.extensions.getExtension<GitExtension>("vscode.git");
|
||||||
if (!gitExtension) {
|
if (!gitExtension) {
|
||||||
throw new Error('Git extension not found');
|
throw new Error("Git extension not found");
|
||||||
}
|
}
|
||||||
|
|
||||||
const api = gitExtension.exports.getAPI(1);
|
const api = gitExtension.exports.getAPI(1);
|
||||||
@@ -134,7 +137,7 @@ async function getActiveGitRepository(): Promise<Repository | null> {
|
|||||||
return api.repositories[0];
|
return api.repositories[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
function getChangeStatus(status: number): GitChange['status'] {
|
function getChangeStatus(status: number): GitChange["status"] {
|
||||||
const Status = {
|
const Status = {
|
||||||
INDEX_MODIFIED: 0,
|
INDEX_MODIFIED: 0,
|
||||||
INDEX_ADDED: 1,
|
INDEX_ADDED: 1,
|
||||||
@@ -146,16 +149,16 @@ function getChangeStatus(status: number): GitChange['status'] {
|
|||||||
};
|
};
|
||||||
|
|
||||||
if (status === Status.INDEX_ADDED || status === Status.UNTRACKED) {
|
if (status === Status.INDEX_ADDED || status === Status.UNTRACKED) {
|
||||||
return 'added';
|
return "added";
|
||||||
}
|
}
|
||||||
if (status === Status.INDEX_DELETED || status === Status.DELETED) {
|
if (status === Status.INDEX_DELETED || status === Status.DELETED) {
|
||||||
return 'deleted';
|
return "deleted";
|
||||||
}
|
}
|
||||||
if (status === Status.INDEX_RENAMED) {
|
if (status === Status.INDEX_RENAMED) {
|
||||||
return 'renamed';
|
return "renamed";
|
||||||
}
|
}
|
||||||
|
|
||||||
return 'modified';
|
return "modified";
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function getRepositoryRoot(): Promise<string | null> {
|
export async function getRepositoryRoot(): Promise<string | null> {
|
||||||
@@ -163,7 +166,7 @@ export async function getRepositoryRoot(): Promise<string | null> {
|
|||||||
if (!repository) {
|
if (!repository) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
if (typeof repository.root === 'string') {
|
if (typeof repository.root === "string") {
|
||||||
return repository.root;
|
return repository.root;
|
||||||
}
|
}
|
||||||
return repository.rootUri.fsPath;
|
return repository.rootUri.fsPath;
|
||||||
|
|||||||
Reference in New Issue
Block a user