Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: use modified uri handling for diff editor #4150

Merged
merged 1 commit into from
Nov 15, 2024
Merged

fix: use modified uri handling for diff editor #4150

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions packages/extension/src/browser/vscode/contributes/menu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,11 +250,10 @@ export class MenusContributionPoint extends VSCodeContributePoint<MenusSchema> {
} else if ((menuId as MenuId) === MenuId.EditorTitle) {
argsTransformer = (uri: URI, _group: IEditorGroup, editorUri?: URI) => {
if (uri.scheme === EditorOpenType.diff) {
// 对于 DiffEditor 情况时，这里的 `editorUri` 会是上次聚焦的编辑器 Uri
// 需要额外处理 DiffEditor 的来源文件 Uri
const original = this.getDataFromQuery(decodeURIComponent(uri.query), 'original');
if (original) {
return [new URI(original).codeUri];
// 对于 DiffEditor 情况时，尝试通过 query 获取 modified URI 作为首个参数
const modified = this.getDataFromQuery(decodeURIComponent(uri.query), 'modified');
if (modified) {
return [new URI(modified).codeUri];
}
}
return [editorUri?.codeUri || uri.codeUri];
Expand Down
Loading