Initial skeleton + dependencies updates

eng/Versions.props

@@ -97,7 +97,7 @@
     <SystemThreadingThreadPoolVersion>4.3.0</SystemThreadingThreadPoolVersion>
     <SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
     <!-- Roslyn packages -->
-    <RoslynVersion>3.9.0-1.20512.2</RoslynVersion>
+    <RoslynVersion>3.9.0-2.20516.5</RoslynVersion>
     <MicrosoftCodeAnalysisEditorFeaturesVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesVersion>
     <MicrosoftCodeAnalysisEditorFeaturesTextVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesTextVersion>
     <MicrosoftCodeAnalysisEditorFeaturesWpfVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesWpfVersion>

global.json

@@ -1,10 +1,9 @@
 {
   "sdk": {
-    "version": "3.1.302",
-    "rollForward": "minor"
+    "version": "3.1.403"
   },
   "tools": {
-    "dotnet": "3.1.302",
+    "dotnet": "3.1.403",
     "vs": {
       "version": "16.4",
       "components": [

vsintegration/src/FSharp.Editor/Debugging/BreakpointResolutionService.fs

@@ -10,8 +10,6 @@ open System.Threading.Tasks
 open System.Linq
 
 open Microsoft.CodeAnalysis
-open Microsoft.CodeAnalysis.Editor.Implementation.Debugging
-open Microsoft.CodeAnalysis.Host.Mef
 open Microsoft.CodeAnalysis.Text
 open Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor.Implementation.Debugging
 

vsintegration/src/FSharp.Editor/Debugging/LanguageDebugInfoService.fs

@@ -2,16 +2,13 @@
 
 namespace Microsoft.VisualStudio.FSharp.Editor
 
-open System
 open System.Composition
 open System.Collections.Generic
 open System.Threading
 open System.Threading.Tasks
 
 open Microsoft.CodeAnalysis
 open Microsoft.CodeAnalysis.Classification
-open Microsoft.CodeAnalysis.Editor.Implementation.Debugging
-open Microsoft.CodeAnalysis.Host.Mef
 open Microsoft.CodeAnalysis.Text
 open Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor.Implementation.Debugging
 

vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj

@@ -53,6 +53,7 @@
     <Compile Include="LanguageService\LanguageService.fs" />
     <Compile Include="LanguageService\AssemblyContentProvider.fs" />
     <Compile Include="LanguageService\SymbolHelpers.fs" />
+    <Compile Include="InlineHints\InlineHints.fs" />
     <Compile Include="Classification\ClassificationDefinitions.fs" />
     <Compile Include="Classification\ClassificationService.fs" />
     <Compile Include="Formatting\BraceMatchingService.fs" />

vsintegration/src/FSharp.Editor/InlineHints/InlineHints.fs

@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
+namespace Microsoft.VisualStudio.FSharp.Editor
+
+open System.Composition
+open System.Collections.Immutable
+open System.Threading
+
+open Microsoft.CodeAnalysis
+open Microsoft.CodeAnalysis.Text
+open Microsoft.CodeAnalysis.ExternalAccess.FSharp.InlineHints
+
+open FSharp.Compiler
+open FSharp.Compiler.Range
+open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.SyntaxTree
+
+[<Export(typeof<IFSharpInlineHintsService>)>]
+type internal FSharpInlineHintsService [<ImportingConstructor>] (checkerProvider: FSharpCheckerProvider, projectInfoManager: FSharpProjectOptionsManager) =
+
+    static let userOpName = "FSharpInlineHints"
+
+    interface IFSharpInlineHintsService with
+        member _.GetInlineHintsAsync(document: Document, _textSpan: TextSpan, cancellationToken: CancellationToken) =
+            asyncMaybe {
+                let! _parsingOptions, projectOptions = projectInfoManager.TryGetOptionsForEditingDocumentOrProject(document, cancellationToken, userOpName)
+                let! sourceText = document.GetTextAsync(cancellationToken)
+                //let defines = CompilerEnvironment.GetCompilationDefinesForEditing parsingOptions
+                //let _textLine = sourceText.Lines.GetLineFromPosition(textSpan.Start)
+                //let _textLinePos = sourceText.Lines.GetLinePosition(textSpan.Start)
+                //let _fcsTextLineNumber = Line.fromZ textLinePos.Line
+                //let! _symbol = Tokenizer.getSymbolAtPosition(document.Id, sourceText, textSpan.Start, document.FilePath, defines, SymbolLookupKind.Greedy, false, false)
+                let! _parseFileResults, _, checkFileResults = checkerProvider.Checker.ParseAndCheckDocument(document, projectOptions, userOpName)
+                let! symbols = checkFileResults.GetAllUsesOfAllSymbolsInFile() |> liftAsync
+                //let! symbolUse = checkFileResults.GetSymbolUseAtLocation(fcsTextLineNumber, symbol.Ident.idRange.EndColumn, textLine.Text.ToString(), symbol.FullIsland, userOpName=userOpName)
+
+                let hints =
+                    [|
+                        for symbol in symbols do
+                            // let givenRange = RoslynHelpers.TextSpanToFSharpRange
+                            let symbolSpan = RoslynHelpers.FSharpRangeToTextSpan(sourceText, symbol.RangeAlternate)
+                            FSharpInlineHint(TextSpan(symbolSpan.Start, 0), ImmutableArray.Create(TaggedText(TextTags.Text, symbol.Symbol.DisplayName + ":")))
+                    |]
+
+                return hints.ToImmutableArray()
+            }
+            |> Async.map (Option.defaultValue ImmutableArray<_>.Empty)
+            |> RoslynHelpers.StartAsyncAsTask(cancellationToken)