Cleanup QuickParse.fs #1478
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,12 +30,12 @@ module internal QuickParse = | |
| // Adjusts the token tag for the given identifier | ||
| // - if we're inside active pattern name (at the bar), correct the token TAG to be an identifier | ||
| let CorrectIdentifierToken (s:string) tokenTag = | ||
| if s.EndsWith "|" then Microsoft.FSharp.Compiler.Parser.tagOfToken (Microsoft.FSharp.Compiler.Parser.token.IDENT s) | ||
| else tokenTag | ||
|
|
||
| let rec isValidStrippedName (name:string) idx = | ||
| if idx = name.Length then false | ||
| elif IsIdentifierPartCharacter name.[idx] then true | ||
| else isValidStrippedName name (idx + 1) | ||
|
|
||
| // Utility function that recognizes whether a name is valid active pattern name | ||
|
|
@@ -143,25 +143,27 @@ module internal QuickParse = | |
| let l = searchLeft p | ||
| let r = searchRight p | ||
| let ident = s.Substring (l, r - l + 1) | ||
| if ident.IndexOf('|') <> -1 && not(isValidActivePatternName(ident)) then None else | ||
| let pos = r + magicalAdjustmentConstant | ||
| Some(ident, pos, false) | ||
| ) | ||
|
|
||
| let GetCompleteIdentifierIsland (tolerateJustAfter:bool) (s : string) (p : int) : (string*int*bool) option = | ||
| if String.IsNullOrEmpty s then None | ||
| else | ||
| let directResult = GetCompleteIdentifierIslandImpl s p | ||
| if tolerateJustAfter && directResult = None then | ||
| GetCompleteIdentifierIslandImpl s (p-1) | ||
| else | ||
| directResult | ||
|
|
||
| let private defaultName = [],"" | ||
|
|
||
| /// Get the partial long name of the identifier to the left of index. | ||
| let GetPartialLongName(line:string,index) = | ||
| if isNull line then defaultName | ||
| elif index < 0 then defaultName | ||
| elif index >= line.Length then defaultName | ||
| else | ||
| let IsIdentifierPartCharacter pos = IsIdentifierPartCharacter line.[pos] | ||
| let IsLongIdentifierPartCharacter pos = IsLongIdentifierPartCharacter line.[pos] | ||
|
|
@@ -183,10 +185,10 @@ module internal QuickParse = | |
| else NameAndResidue() | ||
|
|
||
| let rec InResidue(pos,right) = | ||
| if pos < 0 then [],line.Substring(pos+1,right-pos) | ||
| elif IsDot pos then InName(pos-1,pos,right) | ||
| elif IsLongIdentifierPartCharacter pos then InResidue(pos-1, right) | ||
| else [],line.Substring(pos+1,right-pos) | ||
|
|
||
| let result = InResidue(index,index) | ||
| result | ||
|
|
@@ -197,33 +199,32 @@ module internal QuickParse = | |
|
|
||
| /// Get the partial long name of the identifier to the left of index. | ||
| let GetPartialLongNameEx(line:string,index) : (string list * string) = | ||
| if isNull line then defaultName | ||
| elif index < 0 then defaultName | ||
| elif index >= line.Length then defaultName | ||
| else | ||
| let IsIdentifierPartCharacter pos = IsIdentifierPartCharacter line.[pos] | ||
| let IsIdentifierStartCharacter pos = IsIdentifierPartCharacter pos | ||
| let IsDot pos = line.[pos] = '.' | ||
| let IsTick pos = line.[pos] = '`' | ||
| let IsEndOfComment pos = pos < index - 1 && line.[pos] = '*' && line.[pos + 1] = ')' | ||
| let IsStartOfComment pos = pos < index - 1 && line.[pos] = '(' && line.[pos + 1] = '*' | ||
| let IsWhitespace pos = Char.IsWhiteSpace(line.[pos]) | ||
|
|
||
| let rec SkipWhitespaceBeforeDotIdentifier(pos, ident, current,throwAwayNext) = | ||
| if pos > index then defaultName // we're in whitespace after an identifier, if this is where the cursor is, there is no PLID here | ||
| elif IsWhitespace pos then SkipWhitespaceBeforeDotIdentifier(pos+1,ident,current,throwAwayNext) | ||
| elif IsDot pos then AtStartOfIdentifier(pos+1,ident::current,throwAwayNext) | ||
| elif IsStartOfComment pos then EatComment(1, pos + 1, EatCommentCallContext.SkipWhiteSpaces(ident, current, throwAwayNext)) | ||
| else AtStartOfIdentifier(pos,[],false) // Throw away what we have and start over. | ||
|
|
||
| and EatComment (nesting, pos, callContext) = | ||
| if pos > index then defaultName else | ||
| if IsStartOfComment pos then | ||
| // track balance of closing '*)' | ||
| EatComment(nesting + 1, pos + 2, callContext) | ||
| else | ||
| if IsEndOfComment pos then | ||
| if nesting = 1 then | ||
| // all right, we are at the end of comment, jump outside | ||
| match callContext with | ||
|
|
@@ -240,42 +241,42 @@ module internal QuickParse = | |
|
|
||
| and InUnquotedIdentifier(left:int,pos:int,current,throwAwayNext) = | ||
| if pos > index then | ||
| if throwAwayNext then defaultName else current,line.Substring(left,pos-left) | ||
| else | ||
| if IsIdentifierPartCharacter pos then InUnquotedIdentifier(left,pos+1,current,throwAwayNext) | ||
| elif IsDot pos then | ||
| let ident = line.Substring(left,pos-left) | ||
| AtStartOfIdentifier(pos+1,ident::current,throwAwayNext) | ||
| elif IsWhitespace pos || IsStartOfComment pos then | ||
| let ident = line.Substring(left,pos-left) | ||
| SkipWhitespaceBeforeDotIdentifier(pos, ident, current,throwAwayNext) | ||
| else AtStartOfIdentifier(pos,[],false) // Throw away what we have and start over. | ||
|
|
||
| and InQuotedIdentifier(left:int,pos:int, current,throwAwayNext) = | ||
| if pos > index then | ||
| if throwAwayNext then defaultName else current,line.Substring(left,pos-left) | ||
| else | ||
| let remainingLength = line.Length - pos | ||
|
Contributor
There was a problem hiding this comment. @forki - You haven't really added spaces around other arithmetic operators ... is this intentional? |
||
| if IsTick pos && remainingLength > 1 && IsTick(pos+1) then | ||
| let ident = line.Substring(left, pos-left) | ||
| SkipWhitespaceBeforeDotIdentifier(pos+2,ident,current,throwAwayNext) | ||
| else InQuotedIdentifier(left,pos+1,current,throwAwayNext) | ||
|
|
||
| and AtStartOfIdentifier(pos:int, current, throwAwayNext) = | ||
| if pos > index then | ||
| if throwAwayNext then defaultName else current,"" | ||
| else | ||
| if IsWhitespace pos then AtStartOfIdentifier(pos+1,current,throwAwayNext) | ||
| else | ||
| let remainingLength = line.Length - pos | ||
| if IsTick pos && remainingLength > 1 && IsTick(pos+1) then InQuotedIdentifier(pos+2,pos+2,current,throwAwayNext) | ||
| elif IsStartOfComment pos then EatComment(1, pos + 1, EatCommentCallContext.StartIdentifier(current, throwAwayNext)) | ||
| elif IsIdentifierStartCharacter pos then InUnquotedIdentifier(pos,pos+1,current,throwAwayNext) | ||
| elif IsDot pos then | ||
| if pos = 0 then | ||
| // dot on first char of line, currently treat it like empty identifier to the left | ||
| AtStartOfIdentifier(pos+1,""::current,throwAwayNext) | ||
| elif not (pos > 0 && (IsIdentifierPartCharacter(pos-1) || IsWhitespace(pos-1))) then | ||
| // it's not dots as part.of.a.long.ident, it's e.g. the range operator (..), or some other multi-char operator ending in dot | ||
| if line.[pos-1] = ')' then | ||
| // one very problematic case is someCall(args).Name | ||
|
|
@@ -289,15 +290,13 @@ module internal QuickParse = | |
| AtStartOfIdentifier(pos+1,""::current,throwAwayNext) | ||
| else AtStartOfIdentifier(pos+1,[],throwAwayNext) | ||
| let plid, residue = AtStartOfIdentifier(0,[],false) | ||
| let plid = List.rev plid | ||
| match plid with | ||
| | s::_rest when s.Length > 0 && Char.IsDigit(s.[0]) -> defaultName // "2.0" is not a longId (this might not be right for ``2.0`` but good enough for common case) | ||
| | _ -> plid, residue | ||
|
|
||
| let TokenNameEquals (tokenInfo : FSharpTokenInfo) token2 = | ||
| String.Compare(tokenInfo .TokenName, token2, StringComparison.OrdinalIgnoreCase) = 0 | ||
|
|
||
| // The prefix of the sequence of token names to look for in TestMemberOrOverrideDeclaration, in reverse order | ||
| let private expected = [ [|"dot"|]; [|"ident"|]; [|"member"; "override"|] ] | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
inline perhaps or is it automagically?