Merge remote-tracking branch 'upstream/master' into merges/master-to-…

…fsharp5
xamarin · Mar 20, 2019 · 67ff032 · 67ff032
2 parents 0337cd3 + 2a24ade
commit 67ff032
Show file tree

Hide file tree

Showing 47 changed files with 439 additions and 103 deletions.
diff --git a/Classification/ClassificationDefinitions.fs b/Classification/ClassificationDefinitions.fs
@@ -17,7 +17,7 @@ open Microsoft.VisualStudio.Text.Classification
 open Microsoft.VisualStudio.Utilities
 open Microsoft.CodeAnalysis.Classification
 
-open Microsoft.FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.SourceCodeServices
 
 [<RequireQualifiedAccess>]
 module internal FSharpClassificationTypes =

diff --git a/Classification/ClassificationService.fs b/Classification/ClassificationService.fs
@@ -19,7 +19,7 @@ open Microsoft.CodeAnalysis.Text
 // IVT, we'll maintain the status quo.
 #nowarn "44"
 
-open Microsoft.FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.SourceCodeServices
 
 [<ExportLanguageService(typeof<IEditorClassificationService>, FSharpConstants.FSharpLanguageName)>]
 type internal FSharpClassificationService

diff --git a/CodeFix/AddOpenCodeFixProvider.fs b/CodeFix/AddOpenCodeFixProvider.fs
@@ -12,10 +12,10 @@ open Microsoft.CodeAnalysis.Text
 open Microsoft.CodeAnalysis.CodeFixes
 open Microsoft.CodeAnalysis.CodeActions
 
-open Microsoft.FSharp.Compiler
-open Microsoft.FSharp.Compiler.Range
-open Microsoft.FSharp.Compiler.SourceCodeServices
-open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library 
+open FSharp.Compiler
+open FSharp.Compiler.Range
+open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.AbstractIL.Internal.Library 
 
 [<ExportCodeFixProvider(FSharpConstants.FSharpLanguageName, Name = "AddOpen"); Shared>]
 type internal FSharpAddOpenCodeFixProvider

diff --git a/CodeFix/ImplementInterfaceCodeFixProvider.fs b/CodeFix/ImplementInterfaceCodeFixProvider.fs
@@ -13,9 +13,9 @@ open Microsoft.CodeAnalysis.Text
 open Microsoft.CodeAnalysis.CodeFixes
 open Microsoft.CodeAnalysis.CodeActions
 
-open Microsoft.FSharp.Compiler
-open Microsoft.FSharp.Compiler.Range
-open Microsoft.FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler
+open FSharp.Compiler.Range
+open FSharp.Compiler.SourceCodeServices
 
 [<NoEquality; NoComparison>]
 type internal InterfaceState =

diff --git a/CodeFix/RemoveUnusedOpens.fs b/CodeFix/RemoveUnusedOpens.fs
@@ -12,7 +12,7 @@ open Microsoft.CodeAnalysis.Text
 open Microsoft.CodeAnalysis.CodeFixes
 open Microsoft.CodeAnalysis.CodeActions
 
-open Microsoft.FSharp.Compiler.Range
+open FSharp.Compiler.Range
 
 [<ExportCodeFixProvider(FSharpConstants.FSharpLanguageName, Name = "RemoveUnusedOpens"); Shared>]
 type internal FSharpRemoveUnusedOpensCodeFixProvider

diff --git a/CodeFix/RenameParamToMatchSignature.fs b/CodeFix/RenameParamToMatchSignature.fs
@@ -11,10 +11,10 @@ open Microsoft.CodeAnalysis
 open Microsoft.CodeAnalysis.Text
 open Microsoft.CodeAnalysis.CodeFixes
 
-open Microsoft.FSharp.Compiler
-open Microsoft.FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler
+open FSharp.Compiler.SourceCodeServices
 open Microsoft.VisualStudio.FSharp.Editor.SymbolHelpers
-open Microsoft.FSharp.Compiler.SourceCodeServices.Keywords
+open FSharp.Compiler.SourceCodeServices.Keywords
 
 [<ExportCodeFixProvider(FSharpConstants.FSharpLanguageName, Name = "FSharpRenameParamToMatchSignature"); Shared>]
 type internal FSharpRenameParamToMatchSignature

diff --git a/CodeFix/RenameUnusedValue.fs b/CodeFix/RenameUnusedValue.fs
@@ -12,8 +12,8 @@ open Microsoft.CodeAnalysis.Text
 open Microsoft.CodeAnalysis.CodeFixes
 open Microsoft.CodeAnalysis.CodeActions
 
-open Microsoft.FSharp.Compiler
-open Microsoft.FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler
+open FSharp.Compiler.SourceCodeServices
 
 [<ExportCodeFixProvider(FSharpConstants.FSharpLanguageName, Name = "RenameUnusedValue"); Shared>]
 type internal FSharpRenameUnusedValueCodeFixProvider

diff --git a/CodeFix/ReplaceWithSuggestion.fs b/CodeFix/ReplaceWithSuggestion.fs
@@ -8,9 +8,11 @@ open System.Threading.Tasks
 open Microsoft.CodeAnalysis.Text
 open Microsoft.CodeAnalysis.CodeFixes
 
-open Microsoft.FSharp.Compiler
+open FSharp.Compiler
+open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.Range
 open Microsoft.FSharp.Compiler.SourceCodeServices
-open Microsoft.FSharp.Compiler.Range
+open Microsoft.FSharp.Compiler.Text
 
 [<ExportCodeFixProvider(FSharpConstants.FSharpLanguageName, Name = "ReplaceWithSuggestion"); Shared>]
 type internal FSharpReplaceWithSuggestionCodeFixProvider

diff --git a/CodeLens/FSharpCodeLensService.fs b/CodeLens/FSharpCodeLensService.fs
@@ -16,10 +16,10 @@ open Microsoft.CodeAnalysis.Editor.Shared.Extensions
 open Microsoft.CodeAnalysis.Editor.Shared.Utilities
 open Microsoft.CodeAnalysis.Classification
 
-open Microsoft.FSharp.Compiler
-open Microsoft.FSharp.Compiler.Ast
-open Microsoft.FSharp.Compiler.SourceCodeServices
-open Microsoft.FSharp.Compiler.Range
+open FSharp.Compiler
+open FSharp.Compiler.Ast
+open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.Range
 
 open Microsoft.VisualStudio.FSharp.Editor.Logging
 

diff --git a/Commands/HelpContextService.fs b/Commands/HelpContextService.fs
@@ -9,9 +9,9 @@ open Microsoft.CodeAnalysis.Text
 open Microsoft.CodeAnalysis.Classification
 open Microsoft.VisualStudio.LanguageServices.Implementation.F1Help
 open Microsoft.CodeAnalysis.Host.Mef
-open Microsoft.FSharp.Compiler
-open Microsoft.FSharp.Compiler.Range
-open Microsoft.FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler
+open FSharp.Compiler.Range
+open FSharp.Compiler.SourceCodeServices
 
 [<Shared>]
 [<ExportLanguageService(typeof<IHelpContextService>, FSharpConstants.FSharpLanguageName)>]

diff --git a/Commands/XmlDocCommandService.fs b/Commands/XmlDocCommandService.fs
@@ -15,7 +15,7 @@ open Microsoft.VisualStudio.Text.Editor
 open Microsoft.VisualStudio.TextManager.Interop
 open Microsoft.VisualStudio.Utilities
 open Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem
-open Microsoft.FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.SourceCodeServices
 
 type internal XmlDocCommandFilter 
      (

diff --git a/Common/CodeAnalysisExtensions.fs b/Common/CodeAnalysisExtensions.fs
@@ -2,7 +2,7 @@
 module internal Microsoft.VisualStudio.FSharp.Editor.CodeAnalysisExtensions
 
 open Microsoft.CodeAnalysis
-open Microsoft.FSharp.Compiler.Range
+open FSharp.Compiler.Range
 open System.IO
 
 type Project with

diff --git a/Common/Extensions.fs b/Common/Extensions.fs
@@ -8,10 +8,9 @@ open System.IO
 open Microsoft.CodeAnalysis
 open Microsoft.CodeAnalysis.Text
 open Microsoft.CodeAnalysis.Host
+open FSharp.Compiler.Ast
+open FSharp.Compiler.SourceCodeServices
 open Microsoft.FSharp.Compiler.Text
-open Microsoft.FSharp.Compiler.Ast
-open Microsoft.FSharp.Compiler.SourceCodeServices
-
 
 type Path with
     static member GetFullPathSafe path =

diff --git a/Common/RoslynHelpers.fs b/Common/RoslynHelpers.fs
@@ -10,10 +10,10 @@ open System.Threading.Tasks
 open Microsoft.CodeAnalysis
 open Microsoft.CodeAnalysis.Text
 open Microsoft.CodeAnalysis.Diagnostics
-open Microsoft.FSharp.Compiler
-open Microsoft.FSharp.Compiler.Layout
-open Microsoft.FSharp.Compiler.SourceCodeServices
-open Microsoft.FSharp.Compiler.Range
+open FSharp.Compiler
+open FSharp.Compiler.Layout
+open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.Range
 open Microsoft.VisualStudio.FSharp.Editor.Logging
 
 [<RequireQualifiedAccess>]

diff --git a/Completion/CompletionProvider.fs b/Completion/CompletionProvider.fs
@@ -17,9 +17,9 @@ open Microsoft.CodeAnalysis.Text
 open Microsoft.VisualStudio.Shell
 open Microsoft.VisualStudio.Shell.Interop
 
-open Microsoft.FSharp.Compiler
-open Microsoft.FSharp.Compiler.Range
-open Microsoft.FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler
+open FSharp.Compiler.Range
+open FSharp.Compiler.SourceCodeServices
 open System.Runtime.Caching
 open System.Collections.Concurrent
 

diff --git a/Completion/CompletionUtils.fs b/Completion/CompletionUtils.fs
@@ -9,7 +9,7 @@ open Microsoft.CodeAnalysis.Classification
 open Microsoft.CodeAnalysis.Text
 open Microsoft.CodeAnalysis.Completion
 open System.Globalization
-open Microsoft.FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.SourceCodeServices
 
 module internal CompletionUtils =
 

diff --git a/Completion/SignatureHelp.fs b/Completion/SignatureHelp.fs
@@ -14,9 +14,9 @@ open Microsoft.VisualStudio.Text
 open Microsoft.VisualStudio.Shell
 open Microsoft.VisualStudio.Shell.Interop
 
-open Microsoft.FSharp.Compiler.Layout
-open Microsoft.FSharp.Compiler.Range
-open Microsoft.FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.Layout
+open FSharp.Compiler.Range
+open FSharp.Compiler.SourceCodeServices
 
 [<Shared>]
 [<ExportSignatureHelpProvider("FSharpSignatureHelpProvider", FSharpConstants.FSharpLanguageName)>]

diff --git a/Debugging/BreakpointResolutionService.fs b/Debugging/BreakpointResolutionService.fs
@@ -14,8 +14,8 @@ open Microsoft.CodeAnalysis.Editor.Implementation.Debugging
 open Microsoft.CodeAnalysis.Host.Mef
 open Microsoft.CodeAnalysis.Text
 
-open Microsoft.FSharp.Compiler.SourceCodeServices
-open Microsoft.FSharp.Compiler.Range
+open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.Range
 
 [<Shared>]
 [<ExportLanguageService(typeof<IBreakpointResolutionService>, FSharpConstants.FSharpLanguageName)>]

diff --git a/Debugging/LanguageDebugInfoService.fs b/Debugging/LanguageDebugInfoService.fs
@@ -14,7 +14,7 @@ open Microsoft.CodeAnalysis.Editor.Implementation.Debugging
 open Microsoft.CodeAnalysis.Host.Mef
 open Microsoft.CodeAnalysis.Text
 
-open Microsoft.FSharp.Compiler
+open FSharp.Compiler
 
 [<Shared>]
 [<ExportLanguageService(typeof<ILanguageDebugInfoService>, FSharpConstants.FSharpLanguageName)>]

diff --git a/Diagnostics/DocumentDiagnosticAnalyzer.fs b/Diagnostics/DocumentDiagnosticAnalyzer.fs
@@ -12,8 +12,8 @@ open Microsoft.CodeAnalysis
 open Microsoft.CodeAnalysis.Diagnostics
 open Microsoft.CodeAnalysis.Text
 
-open Microsoft.FSharp.Compiler
-open Microsoft.FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler
+open FSharp.Compiler.SourceCodeServices
 
 
 [<RequireQualifiedAccess>]

diff --git a/Diagnostics/ProjectDiagnosticAnalyzer.fs b/Diagnostics/ProjectDiagnosticAnalyzer.fs
@@ -15,9 +15,9 @@ open Microsoft.CodeAnalysis.Host.Mef
 open Microsoft.CodeAnalysis.Text
 open Microsoft.CodeAnalysis.SolutionCrawler
 
-open Microsoft.FSharp.Compiler
-open Microsoft.FSharp.Compiler.SourceCodeServices
-open Microsoft.FSharp.Compiler.Range
+open FSharp.Compiler
+open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.Range
 
 #if PROJECT_ANALYSIS
 // Project-wide error analysis.  We don't enable this because ParseAndCheckProject checks projects against the versions of the files

diff --git a/Diagnostics/SimplifyNameDiagnosticAnalyzer.fs b/Diagnostics/SimplifyNameDiagnosticAnalyzer.fs
@@ -11,9 +11,9 @@ open System.Runtime.CompilerServices
 
 open Microsoft.CodeAnalysis
 open Microsoft.CodeAnalysis.Diagnostics
-open Microsoft.FSharp.Compiler
-open Microsoft.FSharp.Compiler.Range
-open Microsoft.FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler
+open FSharp.Compiler.Range
+open FSharp.Compiler.SourceCodeServices
 open System.Runtime.Caching
 
 type private TextVersionHash = int

diff --git a/Diagnostics/UnusedDeclarationsAnalyzer.fs b/Diagnostics/UnusedDeclarationsAnalyzer.fs
@@ -10,7 +10,7 @@ open System.Threading.Tasks
 
 open Microsoft.CodeAnalysis
 open Microsoft.CodeAnalysis.Diagnostics
-open Microsoft.FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.SourceCodeServices
 
 [<DiagnosticAnalyzer(FSharpConstants.FSharpLanguageName)>]
 type internal UnusedDeclarationsAnalyzer() =
@@ -70,7 +70,7 @@ type internal UnusedDeclarationsAnalyzer() =
             |> Array.map (fun (m, _) -> m)
 
         //#if DEBUG
-        //let formatRange (x: Microsoft.FSharp.Compiler.Range.range) = sprintf "(%d, %d) - (%d, %d)" x.StartLine x.StartColumn x.EndLine x.EndColumn
+        //let formatRange (x: FSharp.Compiler.Range.range) = sprintf "(%d, %d) - (%d, %d)" x.StartLine x.StartColumn x.EndLine x.EndColumn
 
         //symbolsUses
         //|> Array.map (fun su -> sprintf "%s, %s, is definition = %b, Symbol (def range = %A)" 

diff --git a/Diagnostics/UnusedOpensDiagnosticAnalyzer.fs b/Diagnostics/UnusedOpensDiagnosticAnalyzer.fs
@@ -11,10 +11,10 @@ open System.Threading.Tasks
 open Microsoft.CodeAnalysis
 open Microsoft.CodeAnalysis.Text
 open Microsoft.CodeAnalysis.Diagnostics
-open Microsoft.FSharp.Compiler
-open Microsoft.FSharp.Compiler.Ast
-open Microsoft.FSharp.Compiler.Range
-open Microsoft.FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler
+open FSharp.Compiler.Ast
+open FSharp.Compiler.Range
+open FSharp.Compiler.SourceCodeServices
 open Microsoft.VisualStudio.FSharp.Editor.Symbols
 
 [<DiagnosticAnalyzer(FSharpConstants.FSharpLanguageName)>]

diff --git a/DocComments/XMLDocumentation.fs b/DocComments/XMLDocumentation.fs
@@ -9,9 +9,9 @@ open System.Text.RegularExpressions
 open Internal.Utilities.Collections
 open Microsoft.VisualStudio.Shell
 open Microsoft.VisualStudio.Shell.Interop
-open Microsoft.FSharp.Compiler.SourceCodeServices
-open Microsoft.FSharp.Compiler.Layout
-open Microsoft.FSharp.Compiler.Layout.TaggedTextOps
+open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.Layout
+open FSharp.Compiler.Layout.TaggedTextOps
 
 type internal ITaggedTextCollector =
     abstract Add: text: TaggedText -> unit

diff --git a/DocumentHighlights/DocumentHighlightsService.fs b/DocumentHighlights/DocumentHighlightsService.fs
@@ -12,8 +12,8 @@ open Microsoft.CodeAnalysis.DocumentHighlighting
 open Microsoft.CodeAnalysis.Host.Mef
 open Microsoft.CodeAnalysis.Text
 
-open Microsoft.FSharp.Compiler.SourceCodeServices
-open Microsoft.FSharp.Compiler.Range
+open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.Range
 
 type internal FSharpHighlightSpan =
     { IsDefinition: bool

diff --git a/Formatting/BraceMatchingService.fs b/Formatting/BraceMatchingService.fs
@@ -5,7 +5,7 @@ namespace Microsoft.VisualStudio.FSharp.Editor
 open System.ComponentModel.Composition
 open Microsoft.CodeAnalysis.Text
 open Microsoft.CodeAnalysis.Editor
-open Microsoft.FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.SourceCodeServices
 open System.Runtime.InteropServices
 
 [<ExportBraceMatcher(FSharpConstants.FSharpLanguageName)>]

diff --git a/Formatting/EditorFormattingService.fs b/Formatting/EditorFormattingService.fs
@@ -11,7 +11,7 @@ open Microsoft.CodeAnalysis.Formatting
 open Microsoft.CodeAnalysis.Host.Mef
 open Microsoft.CodeAnalysis.Text
 
-open Microsoft.FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.SourceCodeServices
 open System.Threading
 open System.Windows.Forms
 

diff --git a/Formatting/IndentationService.fs b/Formatting/IndentationService.fs
@@ -12,7 +12,7 @@ open Microsoft.CodeAnalysis.Formatting
 open Microsoft.CodeAnalysis.Host.Mef
 open Microsoft.CodeAnalysis.Text
 
-open Microsoft.FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.SourceCodeServices
 
 [<Shared>]
 [<ExportLanguageService(typeof<ISynchronousIndentationService>, FSharpConstants.FSharpLanguageName)>]

diff --git a/InlineRename/InlineRenameService.fs b/InlineRename/InlineRenameService.fs
@@ -13,9 +13,9 @@ open Microsoft.CodeAnalysis.Editor
 open Microsoft.CodeAnalysis.Host.Mef
 open Microsoft.CodeAnalysis.Text
 
-open Microsoft.FSharp.Compiler
-open Microsoft.FSharp.Compiler.Range
-open Microsoft.FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler
+open FSharp.Compiler.Range
+open FSharp.Compiler.SourceCodeServices
 open Symbols
 
 type internal FailureInlineRenameInfo private () =

diff --git a/LanguageService/AssemblyContentProvider.fs b/LanguageService/AssemblyContentProvider.fs
@@ -5,7 +5,7 @@ namespace Microsoft.VisualStudio.FSharp.Editor
 open System
 open System.ComponentModel.Composition
 
-open Microsoft.FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.SourceCodeServices
 
 [<Export(typeof<AssemblyContentProvider>); Composition.Shared>]
 type internal AssemblyContentProvider () =

diff --git a/LanguageService/FSharpCheckerExtensions.fs b/LanguageService/FSharpCheckerExtensions.fs
@@ -5,9 +5,9 @@ open System
 open System.Threading.Tasks
 open Microsoft.CodeAnalysis
 open Microsoft.CodeAnalysis.Text
-open Microsoft.FSharp.Compiler
-open Microsoft.FSharp.Compiler.Ast
-open Microsoft.FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler
+open FSharp.Compiler.Ast
+open FSharp.Compiler.SourceCodeServices
 
 type FSharpChecker with
     member checker.ParseDocument(document: Document, parsingOptions: FSharpParsingOptions, sourceText: SourceText, userOpName: string) =