Skip to content

fix token omitting problem if multiple tokens are connected. #4041

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

Merged
merged 1 commit into from
Feb 3, 2024
Merged

fix token omitting problem if multiple tokens are connected. #4041

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion plugins/hls-semantic-tokens-plugin/src/Ide/Plugin/SemanticTokens/Tokenize.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ focusTokenAt leaf = do
return (Rope.toText prefix, suffix)
sub :: Char.Position -> Char.Position -> Maybe Char.Position
sub (Char.Position l1 c1) (Char.Position l2 c2)
| l1 == l2 && c1 > c2 = Just $ Char.Position 0 (c1 - c2)
| l1 == l2 && c1 >= c2 = Just $ Char.Position 0 (c1 - c2)
| l1 > l2 = Just $ Char.Position (l1 - l2) c1
| otherwise = Nothing
realSrcLocRopePosition :: RealSrcLoc -> Char.Position
Expand Down
4 changes: 2 additions & 2 deletions plugins/hls-semantic-tokens-plugin/test/testdata/TOperator.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
4:4-5 TFunction "f"
4:6-7 TVariable "x"
4:10-11 TFunction "f"
4:12-13 TOperator "$"
4:14-15 TVariable "x"
4:11-12 TOperator "$"
4:12-13 TVariable "x"
6:2-6 TOperator "$$$$"
7:1-2 TVariable "x"
7:7-11 TOperator "$$$$"
Expand Down
2 changes: 1 addition & 1 deletion plugins/hls-semantic-tokens-plugin/test/testdata/TOperator.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module TOperator where

-- imported operator
go f x = f $ x
go f x = f$x
-- operator defined in local module
($$$$) = b
x = 1 $$$$ 2
Expand Down