Skip to content

Hotfixes... #159

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

Merged
merged 3 commits into from
Jul 13, 2023
Merged

Hotfixes... #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd1cec6
fix: should not disable `disableMethodSnippets.functionArguments` by …
zardoy Jul 13, 2023
5c9ff75
fix(locality-bonus): plugins completions don't display when TS return…
zardoy Jul 13, 2023
8410ab3
feat: Enable `suggestions.displayImportedInfo` to `short-format` by d…
zardoy Jul 13, 2023
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
9 changes: 4 additions & 5 deletions src/configurationType.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,9 @@ export type Configuration = {
*/
'suggestions.keywordsInsertText': 'none' | 'space'
/**
* Will be `format-short` by default in future as super useful!
* Requires TypeScript 5.0+
* Wether to show module name from which completion comes (inserted at start of completion detail)
* @recommended
* @default disable
* @default short-format
*/
'suggestions.displayImportedInfo': 'disable' | 'short-format' | 'long-format'
/**
Expand Down Expand Up @@ -441,8 +440,8 @@ export type Configuration = {
*/
'disableMethodSnippets.jsxAttributes': boolean
/**
* disable method snippets at function arguments
* @default true
* Wether to disable method snippets in function arguments
* @default false
*/
'disableMethodSnippets.functionArguments': boolean
/**
Expand Down
2 changes: 1 addition & 1 deletion typescript/src/completions/displayImportedInfo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export default (entries: ts.CompletionEntry[]) => {
for (const entry of entries) {
const { symbol } = entry
if (!symbol) continue
const [node] = symbol.getDeclarations() ?? []
const [node] = symbol.declarations ?? []
if (!node) continue
let importDeclaration: ts.ImportDeclaration | undefined
if (ts.isImportSpecifier(node) && ts.isNamedImports(node.parent) && ts.isImportDeclaration(node.parent.parent.parent)) {
Expand Down
6 changes: 5 additions & 1 deletion typescript/src/completionsAtPosition.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,12 @@ export const getCompletionsAtPosition = (
}
}
let prior = getPrior()
// todo rethink its usage and maybe always prefill instead
const ensurePrior = () => {
if (!prior) prior = { entries: [], isGlobalCompletion: false, isMemberCompletion: false, isNewIdentifierLocation: false }
if (!prior) {
prior = { entries: [], isGlobalCompletion: false, isMemberCompletion: false, isNewIdentifierLocation: false }
;(sharedCompletionContext.prior as typeof prior) = prior
}
return true
}
const hasSuggestions = prior?.entries.some(({ kind }) => kind !== ts.ScriptElementKind.warning)
Expand Down