Picks up the highlighted text for file search #194906

nikhilkarve · 2023-10-05T15:27:09Z

Fixes #194573

nikhilkarve · 2023-10-06T16:11:29Z

@TylerLeonhardt also as October has started, I was wondering if can we add hacktoberfest-accepted label to this when all looks good? 😃

TylerLeonhardt · 2023-10-06T16:38:08Z

@nikhilkarve you don't have to worry about updating the branch. That's not a blocker for merging. Also, I marked the PR as hacktoberfest-accepted so you should get credit for it... unfortunately, my life is a little chaotic right now so I can't look at this fully right now.

TylerLeonhardt · 2023-10-06T16:38:41Z

src/vs/workbench/browser/actions/quickAccessActions.ts

+	}
+
+	// only happen if it would also happen for the search view
+	const seedSearchStringFromSelection = configurationService.getValue<boolean>('editor.find.seedSearchStringFromSelection');


We should have our own setting. Follow what we did for preserveInput

Got it, added that! Great suggestion @TylerLeonhardt . Let me know if that's correct! Thanks

TylerLeonhardt · 2023-10-06T16:41:31Z

btw, I opened these two issues on the quickTextSearch #194675 and #194835

see if you experience these same bugs in your code as well. If you do, can you fix them in your code please 🙏 I want to merge this PR in without those same bugs.

Also, if you figure out those bugs in your code... you can send us 2 additional PRs fixing the bugs in the quickTextSearch too giving you more hacktoberfest PRs :) if you're interested.

nikhilkarve · 2023-10-06T17:15:00Z

btw, I opened these two issues on the quickTextSearch #194675 and #194835

see if you experience these same bugs in your code as well. If you do, can you fix them in your code please 🙏 I want to merge this PR in without those same bugs.

Also, if you figure out those bugs in your code... you can send us 2 additional PRs fixing the bugs in the quickTextSearch too giving you more hacktoberfest PRs :) if you're interested.

Sure, I would be more than happy to take a look at those issues as well. No problem, I was anyways looking for anymore issues where I can contribute.

07tAnYa · 2023-10-12T05:13:52Z

@TylerLeonhardt Sir if you could add more issues under hactoberfest label, then it would be very benificial for new contributors like me.

andreamah · 2023-10-31T19:03:24Z

src/vs/workbench/contrib/search/browser/search.contribution.ts

@@ -382,6 +382,11 @@ configurationRegistry.registerConfiguration({
 			'description': nls.localize('search.experimental.quickAccess.preserveInput', "Controls whether the last typed input to Quick Search should be restored when opening it the next time."),
 			'default': false
 		},
+		'search.experimental.quickAccess.seedFileSearchStringFromSelection': {


I don't think this needs to be an experimental setting. I think search.quickOpen.seedStringFromSelection should be sufficient.

Got it, will update that

andreamah · 2023-10-31T19:05:03Z

src/vs/workbench/contrib/search/browser/search.contribution.ts

@@ -382,6 +382,11 @@ configurationRegistry.registerConfiguration({
 			'description': nls.localize('search.experimental.quickAccess.preserveInput', "Controls whether the last typed input to Quick Search should be restored when opening it the next time."),
 			'default': false
 		},
+		'search.experimental.quickAccess.seedFileSearchStringFromSelection': {
+			'type': 'boolean',
+			'description': nls.localize('search.experimental.quickAccess.seedFileSearchStringFromSelection', "Controls whether the search string in the Search File Widget is seeded from the editor selection."),


Instead of Search File Widget, we should use Quick Open.

Got it will change

nikhilkarve · 2023-10-31T19:43:39Z

Hi @andreamah I pushed the changes as per your comment. Let me know if that is correct, otherwise I will push what's required asap

andreamah · 2023-10-31T21:06:33Z

src/vs/workbench/browser/quickaccess.ts

+export function getFileSelectionTextFromEditor(allowUnselectedWord: boolean, editor: IEditor): string | null {
+
+	if (!isCodeEditor(editor) || !editor.hasModel()) {
+		return null;
+	}
+
+	const range = editor.getSelection();
+	if (!range) {
+		return null;
+	}
+
+	if (range.isEmpty()) {
+		if (allowUnselectedWord) {
+			const wordAtPosition = editor.getModel().getWordAtPosition(range.getStartPosition());
+			return wordAtPosition?.word ?? null;
+		} else {
+			return null;
+		}
+	}
+
+	let searchText = '';
+	for (let i = range.startLineNumber; i <= range.endLineNumber; i++) {
+		let lineText = editor.getModel().getLineContent(i);
+		if (i === range.endLineNumber) {
+			lineText = lineText.substring(0, range.endColumn - 1);
+		}
+
+		if (i === range.startLineNumber) {
+			lineText = lineText.substring(range.startColumn - 1);
+		}
+
+		if (i !== range.startLineNumber) {
+			lineText = '\n' + lineText;
+		}
+
+		searchText += lineText;
+	}
+
+	return searchText;
+}


just noticed this, but I think that

vscode/src/vs/workbench/contrib/search/browser/searchView.ts

Lines 2143 to 2192 in a7a4d6a

export function getSelectionTextFromEditor(allowUnselectedWord: boolean, activeEditor: IEditor): string | null {

let editor = activeEditor;

if (isDiffEditor(editor)) {

if (editor.getOriginalEditor().hasTextFocus()) {

editor = editor.getOriginalEditor();

} else {

editor = editor.getModifiedEditor();

}

}

if (!isCodeEditor(editor) || !editor.hasModel()) {

return null;

}

const range = editor.getSelection();

if (!range) {

return null;

}

if (range.isEmpty()) {

if (allowUnselectedWord) {

const wordAtPosition = editor.getModel().getWordAtPosition(range.getStartPosition());

return wordAtPosition?.word ?? null;

} else {

return null;

}

}

let searchText = '';

for (let i = range.startLineNumber; i <= range.endLineNumber; i++) {

let lineText = editor.getModel().getLineContent(i);

if (i === range.endLineNumber) {

lineText = lineText.substring(0, range.endColumn - 1);

}

if (i === range.startLineNumber) {

lineText = lineText.substring(range.startColumn - 1);

}

if (i !== range.startLineNumber) {

lineText = '\n' + lineText;

}

searchText += lineText;

}

return searchText;

}

has pretty much the same code, but also makes sure to get text from diff editors. Can you reuse that?

I tried that earlier, I get the following error if I do that while committing

Imports violates 'vs/css!.//* or vs/base/{common,browser}/ or vs/base/parts//{common,browser}/** or vs/platform//{common,browser}/** or vs/editor/{common,browser}/** or vs/editor/contrib//{common,browser}/** or vs/workbench/{common,browser}/** or vs/workbench/services//{common,browser}/** or assert or vs/nls or vs/amdX' restrictions.

Its not letting me import anything from the contrib folder.
https://github.com/microsoft/vscode/wiki/Source-Code-Organization

One way I can think of is writing this function somewhere, probably a folder from which is import is allowed. And then reusing it in both the places. Not sure exactly where though. Are there any conventions?

I'm okay with this code living in quickaccess.ts as long as you have the most up-to-date version of the function (including the newest changes from today).
@TylerLeonhardt are you okay with the selection-grabbing code being here and search just importing it? Ideally, the selection code could be somewhere else more communal in the future and be shared by everything that gets editor selection.

Shall I import the function from quickaccess.ts to searchView.ts then? I think this import is possible. I can change the function name from getFileSelectionTextFromEditor to getSelectionTextFromEditor

Yes, the function would only occur once in quickAccess.ts. Make sure that you have the part

if (isDiffEditor(editor)) { if (editor.getOriginalEditor().hasTextFocus()) { editor = editor.getOriginalEditor(); } else { editor = editor.getModifiedEditor(); } }

Since it looks like your current implementation doesn't have it and it's needed to get the selection in diff editors.

Sure, I will add that too

Yes I think having this in quickaccess.ts for this and search to use makes sense.

I updated the PR with those changes, let me know if this is correct!

andreamah · 2023-10-31T23:20:29Z

looks good! one more thing: can you resolve the merge conflicts with main?

* Add sessionId, agent, and slash command to core telemetry * Enable used references by default

Fix used references expand state

Add chat agent header animation

…cue loop from continuing"

…t-response Revert "accept chat response when session is released, prevent audio cue loop from continuing"

Fixes #196668

…196687)

* aux window - disable main menu * 💄

…del content change

… to last round (#196708) fixes microsoft/vscode-copilot#2403

Adopt documentOverride in xterm.js

Start moving window/document to use layout service

Allow hiding of launcher on Run and Debug title bar when debugging

@workspace

Add agent avatar icon and "using @workspace" text

Show Reload Required buttons simultaneously after updateAllExtensions (#163627)

Terminal: fix rename and injection

Add multi-select renames to terminalAction

Pass terminal context to relevant actions

Layout when switching from welcome to terminal.

nikhilkarve · 2023-11-01T02:12:24Z

looks good! one more thing: can you resolve the merge conflicts with main?

There are a lot of conflicts not sure why. Is it okay if I create a new branch from the current main and create a new PR?

TylerLeonhardt · 2023-11-01T16:57:40Z

Creating a new PR is totally ok :)

nikhilkarve · 2023-11-03T15:15:23Z

@TylerLeonhardt @andreamah
I have created a new PR with latest changes. I am sorry for the trouble!
#197380

This comment was marked as resolved.

Sign in to view

nikhilkarve mentioned this pull request Oct 5, 2023

Search Files By Name Should Use Highlighted Text #194573

Open

vscodenpa assigned andreamah Oct 5, 2023

andreamah assigned TylerLeonhardt Oct 5, 2023

TylerLeonhardt added the hacktoberfest-accepted label Oct 6, 2023

TylerLeonhardt reviewed Oct 6, 2023

View reviewed changes

andreamah suggested changes Oct 31, 2023

View reviewed changes

roblourens and others added 15 commits October 31, 2023 21:48

Fix used references expand state

7a29e75

Enable used references by default (#196654)

6eb6624

* Add sessionId, agent, and slash command to core telemetry * Enable used references by default

Add chat agent header animation

65890d8

Merge pull request #196656 from microsoft/roblou/urban-crocodile

01278b9

Fix used references expand state

Merge pull request #196671 from microsoft/roblou/other-thrush

5773b6e

Add chat agent header animation

Revert "accept chat response when session is released, prevent audio …

66c6abe

…cue loop from continuing"

voice - tweak animation (#196674)

aaf4fa2

Merge pull request #196676 from microsoft/revert-196626-merogge/accep…

4a20e5f

…t-response Revert "accept chat response when session is released, prevent audio cue loop from continuing"

Aux window: "Window 1" is a bad label? (fix #196394) (#196682)

d879941

Cannot read properties of undefined (reading 'commentThreads') (#196683)

bf98fc0

Fixes #196668

Aux window: Chord timeout much smaller in aux window (fix #196184) (#…

9f586a6

…196687)

Centre numbers vertically in top activity bar badges (fix #196691)

513b065

aux window - disable main menu (#196697)

d767d95

* aux window - disable main menu * 💄

canceliing the scheduler and hiding the widget on model change and mo…

468b812

…del content change

no undoStops between streaming edits, esp not between last and second…

9ab9147

… to last round (#196708) fixes microsoft/vscode-copilot#2403

Tyriar and others added 24 commits October 31, 2023 22:06

Merge pull request #195598 from microsoft/tyriar/float_4

f17f9a0

Adopt documentOverride in xterm.js

fix #195834

ab12612

Merge branch 'main' into tyriar/195804

01b117c

Merge pull request #195919 from microsoft/merogge/conad

6d9cdf2

Merge branch 'main' into pink-bedbug

0afaebe

Merge branch 'main' into pink-bedbug

b51d3f4

Invert setting and rename to debug.hideLauncherWhileDebugging

e9ba23d

Merge pull request #195827 from microsoft/tyriar/195804

a725c16

Start moving window/document to use layout service

Merge pull request #193812 from gjsjohnmurray/pink-bedbug

649cc1b

Allow hiding of launcher on Run and Debug title bar when debugging

Add agent avatar icon and "using @workspace" text

91969e3

Merge branch 'main' into attempt-163627v2

0bafca2

Merge branch 'main' into attempt-163627v2

3f06a50

Merge pull request #196178 from microsoft/roblou/interior-vulture

8ec4c18

Add agent avatar icon and "using @workspace" text

Merge pull request #195421 from gjsjohnmurray/attempt-163627v2

b5c9804

Show Reload Required buttons simultaneously after updateAllExtensions (#163627)

Merge branch 'main' into fix-term-quickaccess

ffb9cc3

Merge pull request #194621 from tisilent/fix-term-quickaccess

0e98f35

Terminal: fix rename and injection

Merge branch 'main' into terminal-multi-select-rename

5955636

Merge branch 'main' into tyriar/action_context

f955688

Merge pull request #194912 from tisilent/terminal-multi-select-rename

80afae2

Add multi-select renames to terminalAction

Merge pull request #196853 from microsoft/tyriar/action_context

ecf0bf8

Pass terminal context to relevant actions

Merge branch 'main' into terminal_welcome_view_switch

4ce2bb3

Add _ prefix

9bae26d

Merge pull request #173368 from rehmsen/terminal_welcome_view_switch

d3a4fea

Layout when switching from welcome to terminal.

Merge branch 'main' into file-search-highlighted

ef6873a

nikhilkarve closed this by deleting the head repository Nov 3, 2023

nikhilkarve pushed a commit to nikhilkarve/vscode that referenced this pull request Nov 3, 2023

fixes microsoft#194906

4d2f213

github-actions bot locked and limited conversation to collaborators Dec 18, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Picks up the highlighted text for file search #194906

Picks up the highlighted text for file search #194906

nikhilkarve commented Oct 5, 2023 •

edited by TylerLeonhardt

Loading

This comment was marked as resolved.

nikhilkarve commented Oct 6, 2023 •

edited

Loading

TylerLeonhardt commented Oct 6, 2023

TylerLeonhardt Oct 6, 2023

nikhilkarve Oct 8, 2023

TylerLeonhardt commented Oct 6, 2023

nikhilkarve commented Oct 6, 2023

07tAnYa commented Oct 12, 2023

andreamah Oct 31, 2023

nikhilkarve Oct 31, 2023

andreamah Oct 31, 2023

nikhilkarve Oct 31, 2023

nikhilkarve commented Oct 31, 2023

andreamah Oct 31, 2023

nikhilkarve Oct 31, 2023 •

edited

Loading

nikhilkarve Oct 31, 2023

andreamah Oct 31, 2023

nikhilkarve Oct 31, 2023

andreamah Oct 31, 2023

nikhilkarve Oct 31, 2023

TylerLeonhardt Oct 31, 2023

nikhilkarve Oct 31, 2023

andreamah commented Oct 31, 2023

nikhilkarve commented Nov 1, 2023 •

edited

Loading

TylerLeonhardt commented Nov 1, 2023

nikhilkarve commented Nov 3, 2023

	export function getSelectionTextFromEditor(allowUnselectedWord: boolean, activeEditor: IEditor): string \| null {

	let editor = activeEditor;

	if (isDiffEditor(editor)) {
	if (editor.getOriginalEditor().hasTextFocus()) {
	editor = editor.getOriginalEditor();
	} else {
	editor = editor.getModifiedEditor();
	}
	}

	if (!isCodeEditor(editor) \|\| !editor.hasModel()) {
	return null;
	}

	const range = editor.getSelection();
	if (!range) {
	return null;
	}

	if (range.isEmpty()) {
	if (allowUnselectedWord) {
	const wordAtPosition = editor.getModel().getWordAtPosition(range.getStartPosition());
	return wordAtPosition?.word ?? null;
	} else {
	return null;
	}
	}

	let searchText = '';
	for (let i = range.startLineNumber; i <= range.endLineNumber; i++) {
	let lineText = editor.getModel().getLineContent(i);
	if (i === range.endLineNumber) {
	lineText = lineText.substring(0, range.endColumn - 1);
	}

	if (i === range.startLineNumber) {
	lineText = lineText.substring(range.startColumn - 1);
	}

	if (i !== range.startLineNumber) {
	lineText = '\n' + lineText;
	}

	searchText += lineText;
	}

	return searchText;
	}

Picks up the highlighted text for file search #194906

Picks up the highlighted text for file search #194906

Conversation

nikhilkarve commented Oct 5, 2023 • edited by TylerLeonhardt Loading

This comment was marked as resolved.

nikhilkarve commented Oct 6, 2023 • edited Loading

TylerLeonhardt commented Oct 6, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TylerLeonhardt commented Oct 6, 2023

nikhilkarve commented Oct 6, 2023

07tAnYa commented Oct 12, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nikhilkarve commented Oct 31, 2023

Choose a reason for hiding this comment

nikhilkarve Oct 31, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

andreamah commented Oct 31, 2023

nikhilkarve commented Nov 1, 2023 • edited Loading

TylerLeonhardt commented Nov 1, 2023

nikhilkarve commented Nov 3, 2023

nikhilkarve commented Oct 5, 2023 •

edited by TylerLeonhardt

Loading

nikhilkarve commented Oct 6, 2023 •

edited

Loading

nikhilkarve Oct 31, 2023 •

edited

Loading

nikhilkarve commented Nov 1, 2023 •

edited

Loading