Skip to content

Merge master to release/dev16.2 #6878

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

Merge master to release/dev16.2 #6878

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
070be18
Unify fsharpqa comparer.fsx (#6875)
KevinRansom May 27, 2019
163cb4c
Clean navigation (#6849)
cartermp May 27, 2019
0b8ea17
Use FCS API for keywords instead of LexHelp internals (#6851)
cartermp May 27, 2019
14e5082
Clean unecessary constructs from LanguageService.fs (#6848)
cartermp May 27, 2019
cb51737
Merge branch 'release/dev16.2' into merges/master-to-release/dev16.2
KevinRansom May 27, 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
Prev Previous commit
Next Next commit
Use FCS API for keywords instead of LexHelp internals (#6851) 
* Use FCS API for keywords instead of LexHelp internals

* LexHelp gone
  • Loading branch information
@cartermp @KevinRansom
cartermp authored and KevinRansom committed May 27, 2019
commit 0b8ea174684c2811751ced71c8463743a914e13e
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