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

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
Merge branch 'release/dev16.2' into merges/master-to-release/dev16.2
  • Loading branch information
@KevinRansom
KevinRansom authored May 27, 2019
commit cb51737951185f14cddfe9337e87f4d29f4b7104
4 changes: 4 additions & 0 deletions vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ open Microsoft.VisualStudio.LanguageServices.ProjectSystem
open Microsoft.VisualStudio.Shell
open Microsoft.VisualStudio.Shell.Interop
open Microsoft.VisualStudio.Text.Outlining
open FSharp.NativeInterop
open Microsoft.CodeAnalysis.ExternalAccess.FSharp

#nowarn "9" // NativePtr.toNativeInt

// Used to expose FSharpChecker/ProjectInfo manager to diagnostic providers
// Diagnostic providers can be executed in environment that does not use MEF so they can rely only
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.