Skip to content

Tokenizer: don't assert non-empty identifiers #15462

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 2 commits into from
Jun 22, 2023
Merged

Tokenizer: don't assert non-empty identifiers #15462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69dc15e
Tokenizer: don't assert non-empty identifiers
auduchinok Jun 21, 2023
5cd96d1
Add test
auduchinok Jun 22, 2023
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
6 changes: 1 addition & 5 deletions src/Compiler/Service/ServiceLexing.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,11 +173,7 @@ module internal TokenClassifications =
match token with
| HASH_IDENT s
| IDENT s ->
if s.Length <= 0 then
System.Diagnostics.Debug.Assert(false, "BUG: Received zero length IDENT token.")
// This is related to 4783. Recover by treating as lower case identifier.
(FSharpTokenColorKind.Identifier, FSharpTokenCharKind.Identifier, FSharpTokenTriggerClass.None)
else if Char.ToUpperInvariant s[0] = s[0] then
if s.Length > 0 && Char.ToUpperInvariant s[0] = s[0] then
(FSharpTokenColorKind.UpperIdentifier, FSharpTokenCharKind.Identifier, FSharpTokenTriggerClass.None)
else
(FSharpTokenColorKind.Identifier, FSharpTokenCharKind.Identifier, FSharpTokenTriggerClass.None)
Expand Down
21 changes: 20 additions & 1 deletion tests/service/TokenizerTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module FSharp.Compiler.Service.Tests.TokenizerTests
#endif

open FSharp.Compiler.Tokenization

open FsUnit
open NUnit.Framework

let sourceTok = FSharpSourceTokenizer([], Some "C:\\test.fsx", None)
Expand Down Expand Up @@ -214,3 +214,22 @@ let ``Tokenizer test - single-line nested string interpolation``() =
printfn "expected = %A" expected
Assert.Fail(sprintf "actual and expected did not match,actual =\n%A\nexpected=\n%A\n" actual expected)


[<Test>]
let ``Unfinished idents``() =
let tokenizedLines =
tokenizeLines
[| "`"; "``"; "``a"; "``a`"; "```" |]

let actual =
[ for lineTokens in tokenizedLines |> List.map snd do
[ for str, info in lineTokens -> info.TokenName, str ] ]

let expected =
[["IDENT", "`"]
["IDENT", "``"]
["IDENT", "``a"]
["IDENT", "``a`"]
["IDENT", "```"]]

actual |> shouldEqual expected