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

Add Dirty Diff Peek View #13104

Merged
merged 14 commits into from
Apr 23, 2024
Merged

Add Dirty Diff Peek View #13104

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
af7cab1
Add Dirty Diff Peek View
pisv Nov 27, 2023
7c8fab3
Fix the found issue on Windows
pisv Feb 14, 2024
110735e
Fix the issue with commands not available in the command pallette
pisv Feb 14, 2024
2c82331
Adopt new version of `@theia/monaco-editor-core`
pisv Feb 16, 2024
ab6717b
Fix the flickering issue with removed line decoration on hover
pisv Feb 21, 2024
f1e9f99
Properly dispose `updateTask` in `ScmDecorationsService`
pisv Feb 29, 2024
04002a5
Don't call StandaloneServices.get() in the constructor of inversify-c…
pisv Mar 4, 2024
260cce2
Rename `ChangeRangeMapping` to `RangeMapping`
pisv Mar 4, 2024
d1a9537
Added a requested comment to `ScmDecorationsService`
pisv Mar 11, 2024
622c354
Remove an unnecessary cast
pisv Mar 14, 2024
6429895
Introduce `TextEditor.shouldDisplayDirtyDiff()` method
pisv Mar 15, 2024
1d6ce07
Revise some of the dirty diff related types
pisv Mar 18, 2024
7f2b3d8
Add a comment that commands for dirty diff navigation need to be alwa…
pisv Mar 18, 2024
616187f
Get rid of monaco *internal* API use in `dirty-diff-widget.ts`
pisv Apr 16, 2024
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
Prev Previous commit
Next Next commit
Fix the found issue on Windows 
Ensure that backslashes in fsPath are escaped in the query JSON.
  • Loading branch information
@pisv
pisv committed Apr 16, 2024
commit 7c8fab3d914400b372ef1d7594a592964000c190
3 changes: 2 additions & 1 deletion packages/scm/src/browser/decorations/scm-decorations-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ export class ScmDecorationsService {
const currentRepo = this.scmService.selectedRepository;
if (currentRepo) {
try {
const uri = editor.uri.withScheme(currentRepo.provider.id).withQuery(`{"path":"${editor.uri['codeUri'].fsPath}","ref":"~"}`);
const query = { path: editor.uri['codeUri'].fsPath, ref: '~' };
const uri = editor.uri.withScheme(currentRepo.provider.id).withQuery(JSON.stringify(query));
const previousResource = await this.resourceProvider(uri);
try {
const previousContent = await previousResource.readContents();
Expand Down