Skip to content

Commit ab55cdf

Browse files
authored
Merge pull request #450 from codefori/worksofliam/issue449
Improve handling of undefined references for dot notation
2 parents 5daad3a + ad6d202 commit ab55cdf

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

extension/server/src/providers/completionItem.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,11 @@ export default async function completionItemProvider(handler: CompletionParams):
7070

7171
// Get the possible variable we're referring to
7272
const referenceStart = Parser.getReference(tokens, cursorIndex);
73+
74+
if (referenceStart === undefined) {
75+
return [];
76+
}
77+
7378
let tokenIndex = referenceStart;
7479

7580
let currentDef: Declaration|undefined;

language/parser.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,11 @@ export default class Parser {
191191
checkNextToken--;
192192
}
193193

194+
if (lastToken === -1) return undefined;
195+
if (!tokens[lastToken]) return undefined;
196+
if (![`word`, `builtin`].includes(tokens[lastToken].type)) {
197+
return undefined;
198+
}
194199
return lastToken;
195200
}
196201

0 commit comments

Comments
 (0)