Skip to content
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

Jump to bottom

Fix hashes in LSP diagnostic names #4960

Merged
merged 1 commit into from
May 16, 2024
Merged

Fix hashes in LSP diagnostic names #4960

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 6 additions & 7 deletions unison-cli/src/Unison/LSP/FileAnalysis.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ import Unison.LSP.Conversions qualified as Cv
import Unison.LSP.Diagnostics (DiagnosticSeverity (..), mkDiagnostic, reportDiagnostics)
import Unison.LSP.Orphans ()
import Unison.LSP.Types
import Unison.LSP.Types qualified as LSP
import Unison.LSP.VFS qualified as VFS
import Unison.Name (Name)
import Unison.Names (Names)
Expand Down Expand Up @@ -104,7 +103,8 @@ checkFile doc = runMaybeT do
typecheckingEnv <- computeTypecheckingEnvironment (ShouldUseTndr'Yes parsingEnv) cb ambientAbilities parsedFile
let Result.Result typecheckingNotes maybeTypecheckedFile = FileParsers.synthesizeFile typecheckingEnv parsedFile
pure (typecheckingNotes, Just parsedFile, maybeTypecheckedFile)
(errDiagnostics, codeActions) <- lift $ analyseFile fileUri srcText notes
filePPED <- lift $ ppedForFileHelper parsedFile typecheckedFile
(errDiagnostics, codeActions) <- lift $ analyseFile fileUri srcText filePPED notes
let codeActionRanges =
codeActions
& foldMap (\(RangedCodeAction {_codeActionRanges, _codeAction}) -> (,_codeAction) <$> _codeActionRanges)
Expand Down Expand Up @@ -155,10 +155,10 @@ fileAnalysisWorker = forever do
for freshlyCheckedFiles \(FileAnalysis {fileUri, fileVersion, diagnostics}) -> do
reportDiagnostics fileUri (Just fileVersion) $ fold diagnostics

analyseFile :: (Foldable f) => Uri -> Text -> f (Note Symbol Ann) -> Lsp ([Diagnostic], [RangedCodeAction])
analyseFile fileUri srcText notes = do
pped <- PPED.suffixifiedPPE <$> LSP.currentPPED
(noteDiags, noteActions) <- analyseNotes fileUri pped (Text.unpack srcText) notes
analyseFile :: (Foldable f) => Uri -> Text -> PPED.PrettyPrintEnvDecl -> f (Note Symbol Ann) -> Lsp ([Diagnostic], [RangedCodeAction])
analyseFile fileUri srcText pped notes = do
let ppe = PPED.suffixifiedPPE pped
(noteDiags, noteActions) <- analyseNotes fileUri ppe (Text.unpack srcText) notes
pure (noteDiags, noteActions)

-- | Returns diagnostics which show a warning diagnostic when editing a term that's conflicted in the
Expand Down Expand Up @@ -357,7 +357,6 @@ analyseNotes fileUri ppe src notes = do
| not (isUserBlank v) = pure []
| otherwise = do
Env {codebase} <- ask
ppe <- PPED.suffixifiedPPE <$> currentPPED
let cleanedTyp = Context.generalizeAndUnTypeVar typ -- TODO: is this right?
refs <- liftIO . Codebase.runTransaction codebase $ Codebase.termsOfType codebase cleanedTyp
forMaybe (toList refs) $ \ref -> runMaybeT $ do
Expand Down
Loading