Skip to content

Use FCS API for keywords instead of LexHelp internals #6851

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
KevinRansom merged 2 commits into from
May 27, 2019
Merged

Use FCS API for keywords instead of LexHelp internals #6851

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
236be22
Use FCS API for keywords instead of LexHelp internals
cartermp May 24, 2019
595860a
LexHelp gone
cartermp May 25, 2019
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 vsintegration/src/FSharp.Editor/Completion/CompletionProvider.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,17 @@ open System.Collections.Generic
open System.Collections.Immutable
open System.Threading
open System.Threading.Tasks
open System.Runtime.CompilerServices

open Microsoft.CodeAnalysis
open Microsoft.CodeAnalysis.Completion
open Microsoft.CodeAnalysis.Options
open Microsoft.CodeAnalysis.Text

open Microsoft.VisualStudio.Shell
open Microsoft.VisualStudio.Shell.Interop

open FSharp.Compiler
open FSharp.Compiler.Range
open FSharp.Compiler.SourceCodeServices
open System.Runtime.Caching
open System.Collections.Concurrent

module Logger = Microsoft.VisualStudio.FSharp.Editor.Logger

Expand All @@ -48,7 +44,7 @@ type internal FSharpCompletionProvider
static let [<Literal>] IndexPropName = "Index"

static let keywordCompletionItems =
Lexhelp.Keywords.keywordsWithDescription
Keywords.KeywordsWithDescription
|> List.filter (fun (keyword, _) -> not (PrettyNaming.IsOperatorName keyword))
|> List.sortBy (fun (keyword, _) -> keyword)
|> List.mapi (fun n (keyword, description) ->
Expand Down
2 changes: 1 addition & 1 deletion vsintegration/src/FSharp.Editor/InlineRename/InlineRenameService.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ type internal InlineRenameLocationSet(locations: InlineRenameLocation [], origin
match symbolKind with
| LexerSymbolKind.GenericTypeParameter
| LexerSymbolKind.StaticallyResolvedTypeParameter -> replacementText
| _ -> Lexhelp.Keywords.NormalizeIdentifierBackticks replacementText
| _ -> Keywords.NormalizeIdentifierBackticks replacementText
return
{ new IInlineRenameReplacementInfo with
member __.NewSolution = newSolution
Expand Down
2 changes: 1 addition & 1 deletion vsintegration/src/FSharp.Editor/LanguageService/Tokenizer.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,7 +809,7 @@ module internal Tokenizer =
else PrettyNaming.IsIdentifierPartCharacter c)

let isFixableIdentifier (s: string) =
not (String.IsNullOrEmpty s) && Lexhelp.Keywords.NormalizeIdentifierBackticks s |> isIdentifier
not (String.IsNullOrEmpty s) && Keywords.NormalizeIdentifierBackticks s |> isIdentifier

let forbiddenChars = [| '.'; '+'; '$'; '&'; '['; ']'; '/'; '\\'; '*'; '\"' |]

Expand Down