gitea/infio-copilot-dev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix inline edit can't up error

Browse Source
This commit is contained in:
duanfuxiang
2025-04-30 18:47:14 +08:00
parent dfdb21e832
commit 92b5c8fe61
6 changed files with 97 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/apply-view/ApplyViewRoot.tsx
View File

@@ -53,8 +53,11 @@ export default function ApplyViewRoot({
}
return result;
}, '')
await app.vault.modify(state.file, newContent)
const file = app.vault.getFileByPath(state.file)
if (!file) {
throw new Error('File not found')
}
await app.vault.modify(file, newContent)
if (state.onClose) {
state.onClose(true)
}

8
src/components/chat-view/ChatView.tsx
View File

@@ -401,7 +401,7 @@ const Chat = forwardRef<ChatRef, ChatProps>((props, ref) => {
type: APPLY_VIEW_TYPE,
active: true,
state: {
file: opFile,
file: opFile.path,
oldContent: '',
newContent: toolArgs.content,
onClose: (applied: boolean) => {
@@ -452,7 +452,7 @@ const Chat = forwardRef<ChatRef, ChatProps>((props, ref) => {
type: APPLY_VIEW_TYPE,
active: true,
state: {
file: opFile,
file: opFile.path,
oldContent: fileContent,
newContent: appliedFileContent,
onClose: (applied: boolean) => {
@@ -494,7 +494,7 @@ const Chat = forwardRef<ChatRef, ChatProps>((props, ref) => {
type: APPLY_VIEW_TYPE,
active: true,
state: {
file: opFile,
file: opFile.path,
oldContent: fileContent,
newContent: appliedFileContent,
onClose: (applied: boolean) => {
@@ -536,7 +536,7 @@ const Chat = forwardRef<ChatRef, ChatProps>((props, ref) => {
type: APPLY_VIEW_TYPE,
active: true,
state: {
file: opFile,
file: opFile.path,
oldContent: fileContent,
newContent: appliedResult.content,
onClose: (applied: boolean) => {

2
src/components/chat-view/CustomModeView.tsx
View File

@@ -98,7 +98,7 @@ const CustomModeView = () => {
setCustomInstructions(customMode.customInstructions || '');
setSelectedTools(customMode.groups);
} else {
console.log("error, custom mode not found")
console.error("custom mode not found")
}
}
}, [selectedMode, customModeList]);

39
src/components/inline-edit/InlineEdit.tsx
View File

@@ -11,7 +11,7 @@ import { removeAITags } from '../../utils/content-filter';
import { PromptGenerator } from '../../utils/prompt-generator';
type InlineEditProps = {
source: string;
source?: string;
secStartLine: number;
secEndLine: number;
plugin: Plugin;
@@ -173,20 +173,14 @@ export const InlineEdit: React.FC<InlineEditProps> = ({
};
const parseSmartComposeBlock = (content: string) => {
const match = /<infio_block[^>]*>([\s\S]*?)<\/infio_block>/.exec(content);
const match = /<response>([\s\S]*?)<\/response>/.exec(content);
if (!match) {
return null;
}
const blockContent = match[1].trim();
const attributes = /startLine="(\d+)"/.exec(match[0]);
const startLine = attributes ? parseInt(attributes[1]) : undefined;
const endLineMatch = /endLine="(\d+)"/.exec(match[0]);
const endLine = endLineMatch ? parseInt(endLineMatch[1]) : undefined;
return {
startLine,
endLine,
content: blockContent,
};
};
@@ -196,6 +190,7 @@ export const InlineEdit: React.FC<InlineEditProps> = ({
try {
const { activeFile, editor, selection } = await getActiveContext();
if (!activeFile || !editor || !selection) {
console.error("No active file, editor, or selection");
setIsSubmitting(false);
return;
}
@@ -237,14 +232,26 @@ export const InlineEdit: React.FC<InlineEditProps> = ({
response.choices[0].message.content
);
const finalContent = parsedBlock?.content || response.choices[0].message.content;
const startLine = parsedBlock?.startLine || defaultStartLine;
const endLine = parsedBlock?.endLine || defaultEndLine;
if (!activeFile || !(activeFile.path && typeof activeFile.path === 'string')) {
setIsSubmitting(false);
throw new Error("Invalid active file");
}
let fileContent: string;
try {
fileContent = await plugin.app.vault.cachedRead(activeFile);
} catch (error) {
console.error("Failed to read file:", error);
setIsSubmitting(false);
return;
}
const updatedContent = await ApplyEditToFile(
await plugin.app.vault.cachedRead(activeFile),
fileContent,
finalContent,
startLine,
endLine
defaultStartLine,
defaultEndLine
);
if (!updatedContent) {
@@ -258,7 +265,7 @@ export const InlineEdit: React.FC<InlineEditProps> = ({
type: APPLY_VIEW_TYPE,
active: true,
state: {
file: activeFile,
file: activeFile.path,
oldContent: removeAITags(oldContent),
newContent: removeAITags(updatedContent),
},
@@ -277,8 +284,8 @@ export const InlineEdit: React.FC<InlineEditProps> = ({
<InputArea value={instruction} onChange={setInstruction} handleSubmit={handleSubmit} handleClose={handleClose} />
<button className="infio-ai-block-close-button" onClick={handleClose}>
<svg
width="14"
height="14"
width="16"
height="16"
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"