Skip to content

Commit 7eed303

Browse files
committed
containingFile Nullable
1 parent f5967af commit 7eed303

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

EmmyLua-Common/src/main/ext/com/tang/intellij/lua/editor/completion/LookupElementFactory.kt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,13 @@ object LookupElementFactory {
4242
isColonStyle: Boolean,
4343
fnTy: ITyFunction,
4444
icon: Icon?): LuaLookupElement {
45-
val file = classMember.containingFile.virtualFile as ILuaFile
4645
val item = buildSignatureCompletionItem(lookupString, signature, isColonStyle)
4746
item.kind = CompletionItemKind.Method
4847
item.itemText = "[$clazzName]"
49-
item.data = "${file.uri}|${classMember.textOffset}"
48+
val file = classMember.containingFile?.virtualFile as? ILuaFile
49+
if (file != null) {
50+
item.data = "${file.uri}|${classMember.textOffset}"
51+
}
5052
return item
5153
}
5254

@@ -55,10 +57,12 @@ object LookupElementFactory {
5557
field: LuaClassField,
5658
ty: ITy?,
5759
bold: Boolean): LuaLookupElement {
58-
val file = field.containingFile.virtualFile as ILuaFile
5960
val element = LuaLookupElement(name)
60-
element.data = "${file.uri}|${field.textOffset}"
6161
element.kind = CompletionItemKind.Field
62+
val file = field.containingFile?.virtualFile as? ILuaFile
63+
if (file != null) {
64+
element.data = "${file.uri}|${field.textOffset}"
65+
}
6266
return element
6367
}
6468

EmmyLua-LS/src/main/kotlin/com/tang/vscode/LuaTextDocumentService.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,9 @@ class LuaTextDocumentService(private val workspace: LuaWorkspaceService) : TextD
224224
val target = TargetElementUtil.findTarget(psiFile, i)
225225
val resolve = target?.reference?.resolve()
226226
if (resolve != null) {
227-
val sourceFile = resolve.containingFile.virtualFile as LuaFile
227+
val sourceFile = resolve.containingFile?.virtualFile as? LuaFile
228228
val range = resolve.nameRange
229-
if (range != null)
229+
if (range != null && sourceFile != null)
230230
list.add(Location(sourceFile.uri.toString(), range.toRange(sourceFile)))
231231
}
232232
}

0 commit comments

Comments
 (0)