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

Jump to bottom

Open SIW results as previews #10839

Merged
merged 1 commit into from
Mar 4, 2022
Merged

Open SIW results as previews #10839

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
18 changes: 12 additions & 6 deletions packages/search-in-workspace/src/browser/search-in-workspace-result-tree-widget.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import {
import { CancellationTokenSource, Emitter, Event, isWindows, ProgressService } from '@theia/core';
import {
EditorManager, EditorDecoration, TrackedRangeStickiness, OverviewRulerLane,
EditorWidget, ReplaceOperation, EditorOpenerOptions, FindMatch
EditorWidget, EditorOpenerOptions, FindMatch
} from '@theia/editor/lib/browser';
import { WorkspaceService } from '@theia/workspace/lib/browser';
import { FileResourceResolver, FileSystemPreferences } from '@theia/filesystem/lib/browser';
Expand Down Expand Up @@ -169,7 +169,12 @@ export class SearchInWorkspaceResultTreeWidget extends TreeWidget {
this.toDispose.push(model.onSelectionChanged(nodes => {
const node = nodes[0];
if (SearchInWorkspaceResultLineNode.is(node)) {
this.doOpen(node, true);
this.doOpen(node, true, true);
}
}));
this.toDispose.push(model.onOpenNode(node => {
if (SearchInWorkspaceResultLineNode.is(node)) {
this.doOpen(node, true, false);
}
}));

Expand Down Expand Up @@ -877,7 +882,7 @@ export class SearchInWorkspaceResultTreeWidget extends TreeWidget {
character: resultLineNode.character - 1 + resultLineNode.length
}
}
} as ReplaceOperation));
}));
// Replace the text.
await widget.editor.replaceText({
source,
Expand Down Expand Up @@ -1044,10 +1049,10 @@ export class SearchInWorkspaceResultTreeWidget extends TreeWidget {
return editorWidget;
}

protected async doOpen(node: SearchInWorkspaceResultLineNode, preview: boolean = false): Promise<EditorWidget> {
protected async doOpen(node: SearchInWorkspaceResultLineNode, asDiffWidget = false, preview = false): Promise<EditorWidget> {
let fileUri: URI;
const resultNode = node.parent;
if (resultNode && this.isReplacing && preview) {
if (resultNode && this.isReplacing && asDiffWidget) {
const leftUri = new URI(node.fileUri);
const rightUri = await this.createReplacePreview(resultNode);
fileUri = DiffUris.encode(leftUri, rightUri);
Expand All @@ -1066,7 +1071,8 @@ export class SearchInWorkspaceResultTreeWidget extends TreeWidget {
character: node.character - 1 + node.length
}
},
mode: 'reveal'
mode: preview ? 'reveal' : 'activate',
preview,
};

const editorWidget = await this.editorManager.open(fileUri, opts);
Expand Down