Merge pull request #5175 from unisonweb/cp/trailing-bang-lsp

unisonweb · Jul 2, 2024 · 54e17f2 · 54e17f2
2 parents e99fb07 + 92a74df
commit 54e17f2
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/unison-cli/src/Unison/LSP/VFS.hs b/unison-cli/src/Unison/LSP/VFS.hs
@@ -81,7 +81,11 @@ identifierSplitAtPosition uri pos = do
   vf <- getVirtualFile uri
   PosPrefixInfo {fullLine, cursorPos} <- MaybeT (VFS.getCompletionPrefix pos vf)
   let (before, after) = Text.splitAt (cursorPos ^. character . to fromIntegral) fullLine
-  pure (Text.takeWhileEnd isIdentifierChar before, Text.takeWhile isIdentifierChar after)
+  pure
+    ( Text.takeWhileEnd isIdentifierChar before,
+      -- names can end with '!', and it's not a force, so we include it in the identifier if it's at the end.
+      Text.takeWhile (\c -> isIdentifierChar c || c == '!') after
+    )
   where
     isIdentifierChar c =
       -- Manually exclude '!' and apostrophe, since those are usually just forces and