Commit 01a692c

committed

Return only variables for parameter expansion completions

1 parent c62c574 commit 01a692cCopy full SHA for 01a692c

File tree

2 files changed

+25

-9

lines changed

server/src
- analyser.ts
- server.ts

2 files changed

+25

-9

lines changed

`‎server/src/analyser.ts`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -434,6 +434,10 @@ export default class Analyzer {`
`434`	`434`	`return null`
`435`	`435`	`}`
`436`	`436`
	`437`	`+ public getAllVariableSymbols(): LSP.SymbolInformation[] {`
	`438`	`+ return this.getAllSymbols().filter(symbol => symbol.kind === LSP.SymbolKind.Variable)`
	`439`	`+ }`
	`440`	`+`
`437`	`441`	`private getAllSymbols(): LSP.SymbolInformation[] {`
`438`	`442`	`// NOTE: this could be cached, it takes < 1 ms to generate for a project with 250 bash files...`
`439`	`443`	`const symbols: LSP.SymbolInformation[] = []`

`‎server/src/server.ts`

Lines changed: 21 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@ import { BashCompletionItem, CompletionItemDataType } from './types'`
`13`	`13`	`import { uniqueBasedOnHash } from './util/array'`
`14`	`14`	`import { getShellDocumentation } from './util/sh'`
`15`	`15`
	`16`	`+const PARAMETER_EXPANSION_PREFIXES = new Set(['$', '${', '${#'])`
	`17`	`+`
`16`	`18`	`/**`
`17`	`19`	`* The BashServer glues together the separate components to implement`
`18`	`20`	`* the various parts of the Language Server Protocol.`
`@@ -304,19 +306,34 @@ export default class BashServer {`
`304`	`306`	`})`
`305`	`307`	`this.logRequest({ request: 'onCompletion', params, word })`
`306`	`308`
	`309`	`+ if (word && word.startsWith('#')) {`
	`310`	`+ // Inside a comment block`
	`311`	`+ return []`
	`312`	`+ }`
	`313`	`+`
`307`	`314`	`const currentUri = params.textDocument.uri`
`308`	`315`
	`316`	`+ const shouldCompleteOnVariables = word`
	`317`	`+ ? PARAMETER_EXPANSION_PREFIXES.has(word)`
	`318`	`+ : false`
	`319`	`+`
`309`	`320`	`const symbolCompletions =`
`310`	`321`	`word === null`
`311`	`322`	`? []`
`312`	`323`	`: this.getCompletionItemsForSymbols({`
`313`		`- symbols: this.analyzer.findSymbolsMatchingWord({`
`314`		`- exactMatch: false,`
`315`		`- word,`
`316`		`- }),`
	`324`	`+ symbols: shouldCompleteOnVariables`
	`325`	`+ ? this.analyzer.getAllVariableSymbols()`
	`326`	`+ : this.analyzer.findSymbolsMatchingWord({`
	`327`	`+ exactMatch: false,`
	`328`	`+ word,`
	`329`	`+ }),`
`317`	`330`	`currentUri,`
`318`	`331`	`})`
`319`	`332`
	`333`	`+ if (shouldCompleteOnVariables) {`
	`334`	`+ return symbolCompletions`
	`335`	`+ }`
	`336`	`+`
`320`	`337`	`const reservedWordsCompletions = ReservedWords.LIST.map(reservedWord => ({`
`321`	`338`	`label: reservedWord,`
`322`	`339`	`kind: LSP.SymbolKind.Interface, // ??`
`@@ -357,11 +374,6 @@ export default class BashServer {`
`357`	`374`	`]`
`358`	`375`
`359`	`376`	`if (word) {`
`360`		`- if (word.startsWith('#')) {`
`361`		`- // Inside a comment block`
`362`		`- return []`
`363`		`- }`
`364`		`-`
`365`	`377`	`// Filter to only return suffixes of the current word`
`366`	`378`	`return allCompletions.filter(item => item.label.startsWith(word))`
`367`	`379`	`}`

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 01a692c

File tree

2 files changed

2 files changed

`‎server/src/analyser.ts`

`‎server/src/server.ts`

0 commit comments