From c080f1cbb12ed65f3e9f0ee4ba5ccc090f6554d2 Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Sun, 29 May 2022 12:07:47 -0700 Subject: [PATCH] Fixed moreinfo hover crash with no source location --- IDE/src/IDEApp.bf | 4 +--- IDE/src/ui/SourceViewPanel.bf | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/IDE/src/IDEApp.bf b/IDE/src/IDEApp.bf index be821696..de024ec9 100644 --- a/IDE/src/IDEApp.bf +++ b/IDE/src/IDEApp.bf @@ -1118,9 +1118,7 @@ namespace IDE { int32 charIdx = int32.Parse(loc).GetValueOrDefault(); var fileEditData = GetEditData(cmds[1]); - if (fileEditData == null) - break; - fileEditData.mEditWidget.mEditWidgetContent.GetLineCharAtIdx(charIdx, out line, out lineChar); + fileEditData?.mEditWidget?.mEditWidgetContent.GetLineCharAtIdx(charIdx, out line, out lineChar); } ShowSourceFileLocation(cmds[1], -1, -1, line, lineChar, .Smart, true); case "ShowCodeAddr": diff --git a/IDE/src/ui/SourceViewPanel.bf b/IDE/src/ui/SourceViewPanel.bf index d8323d75..3634edaa 100644 --- a/IDE/src/ui/SourceViewPanel.bf +++ b/IDE/src/ui/SourceViewPanel.bf @@ -5697,11 +5697,11 @@ namespace IDE.ui for (var moreInfo in bestError.mMoreInfo) { if (moreInfo.mLine != -1) - { showMouseoverString.AppendF("\n@{}\t{}:{}\t{}", moreInfo.mFilePath, moreInfo.mLine, moreInfo.mColumn, moreInfo.mError); - } - else + else if (moreInfo.mFilePath != null) showMouseoverString.AppendF("\n@{0}\t{1}\t{2}", moreInfo.mFilePath, moreInfo.mSrcStart, moreInfo.mError); + else + showMouseoverString.AppendF("\n{}", moreInfo.mError); } } }