Commit 9abde3c

committed

Improve search for connected URIs

1 parent 6dea0b5 commit 9abde3cCopy full SHA for 9abde3c

File tree

2 files changed

+27

-9

lines changed

server/src
- analyser.ts
- server.ts

2 files changed

+27

-9

lines changed

`‎server/src/analyser.ts‎`

Lines changed: 26 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -864,23 +864,41 @@ export default class Analyzer {`
`864`	`864`	`this.includeAllWorkspaceSymbols = includeAllWorkspaceSymbols`
`865`	`865`	`}`
`866`	`866`
`867`		`- // TODO: Handle cases where sourcing files gets sourced.`
`868`		`- public findAllSourcingUris(uri: string): string[] {`
	`867`	`+ /**`
	`868`	+ * If `includeAllWorkspaceSymbols` is true, this returns all URIs from the
	`869`	`+ * background analysis. Else, it returns the URIs of the files that are`
	`870`	+ * connected to `uri` via sourcing.
	`871`	`+ */`
	`872`	`+ public findAllConnectedUris(uri: string): string[] {`
`869`	`873`	`if (this.includeAllWorkspaceSymbols) {`
`870`	`874`	`return Object.keys(this.uriToAnalyzedDocument)`
`871`	`875`	`}`
`872`	`876`
`873`		`- const uris = []`
`874`		`- for (const [u, ad] of Object.entries(this.uriToAnalyzedDocument)) {`
`875`		`- if (ad?.sourcedUris) {`
`876`		`- for (const v of ad.sourcedUris.values()) {`
`877`		`- if (v === uri) {`
`878`		`- uris.push(u)`
	`877`	`+ const uriToAnalyzedDocument = Object.entries(this.uriToAnalyzedDocument)`
	`878`	`+ const uris: string[] = []`
	`879`	`+ let continueSearching = true`
	`880`	`+`
	`881`	`+ while (continueSearching) {`
	`882`	`+ continueSearching = false`
	`883`	`+`
	`884`	`+ for (const [analyzedUri, analyzedDocument] of uriToAnalyzedDocument) {`
	`885`	`+ if (!analyzedDocument) {`
	`886`	`+ continue`
	`887`	`+ }`
	`888`	`+`
	`889`	`+ for (const sourcedUri of analyzedDocument.sourcedUris.values()) {`
	`890`	`+ if (`
	`891`	`+ (sourcedUri === uri \|\| uris.includes(sourcedUri)) &&`
	`892`	`+ !uris.includes(analyzedUri)`
	`893`	`+ ) {`
	`894`	`+ uris.push(analyzedUri)`
	`895`	`+ continueSearching = true`
`879`	`896`	`break`
`880`	`897`	`}`
`881`	`898`	`}`
`882`	`899`	`}`
`883`	`900`	`}`
	`901`	`+`
`884`	`902`	`return uris`
`885`	`903`	`}`
`886`	`904`

`‎server/src/server.ts‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -815,7 +815,7 @@ export default class BashServer {`
`815`	`815`	`newText: params.newName,`
`816`	`816`	`}))`
`817`	`817`
`818`		`- for (const uri of this.analyzer.findAllSourcingUris(declaration.uri)) {`
	`818`	`+ for (const uri of this.analyzer.findAllConnectedUris(declaration.uri)) {`
`819`	`819`	`edits.changes[uri] = this.analyzer`
`820`	`820`	`.findOccurrencesWithin({`
`821`	`821`	`uri,`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 9abde3c

File tree

2 files changed

2 files changed

`‎server/src/analyser.ts‎`

`‎server/src/server.ts‎`

0 commit comments