Rebase with FCS 2021-06-08

.vscode/launch.json

@@ -0,0 +1,18 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": ".NET Core Launch (console)",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "${workspaceFolder}/artifacts/bin/fcs-test/Debug/net5.0/fcs-test.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}/fcs/fcs-test",
+            "console": "internalConsole",
+            "stopAtEntry": false
+        }
+    ]
+}

fcs/build.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+dotnet build -c Release src/buildtools/buildtools.proj
+dotnet build -c Release src/fsharp/FSharp.Compiler.Service
+#dotnet /usr/share/dotnet/sdk/5.0.402/MSBuild.dll /p:Configuration=Release /p:FscToolExe=fsc src/fsharp/FSharp.Compiler.Service/

fcs/fcs-test/Program.fs

@@ -0,0 +1,124 @@
+open System.IO
+open FSharp.Compiler
+open FSharp.Compiler.CodeAnalysis
+open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.EditorServices
+
+let getProjectOptions (folder: string) (projectFile: string) =
+    let runProcess (workingDir: string) (exePath: string) (args: string) =
+        let psi = System.Diagnostics.ProcessStartInfo()
+        psi.FileName <- exePath
+        psi.WorkingDirectory <- workingDir
+        psi.RedirectStandardOutput <- false
+        psi.RedirectStandardError <- false
+        psi.Arguments <- args
+        psi.CreateNoWindow <- true
+        psi.UseShellExecute <- false
+
+        use p = new System.Diagnostics.Process()
+        p.StartInfo <- psi
+        p.Start() |> ignore
+        p.WaitForExit()
+
+        let exitCode = p.ExitCode
+        exitCode, ()
+
+    let runCmd exePath args = runProcess folder exePath (args |> String.concat " ")
+    let msbuildExec = Dotnet.ProjInfo.Inspect.dotnetMsbuild runCmd
+    let result = Dotnet.ProjInfo.Inspect.getProjectInfo ignore msbuildExec Dotnet.ProjInfo.Inspect.getFscArgs projectFile
+    match result with
+    | Ok (Dotnet.ProjInfo.Inspect.GetResult.FscArgs x) -> x
+    | _ -> []
+
+let mkStandardProjectReferences () = 
+    let projFile = "fcs-test.fsproj"
+    let projDir = __SOURCE_DIRECTORY__
+    getProjectOptions projDir projFile
+    |> List.filter (fun s -> s.StartsWith("-r:"))
+    |> List.map (fun s -> s.Replace("-r:", ""))
+
+let mkProjectCommandLineArgsForScript (dllName, fileNames) = 
+    [|  yield "--simpleresolution" 
+        yield "--noframework" 
+        yield "--debug:full" 
+        yield "--define:DEBUG" 
+        yield "--optimize-" 
+        yield "--out:" + dllName
+        yield "--doc:test.xml" 
+        yield "--warn:3" 
+        yield "--fullpaths" 
+        yield "--flaterrors" 
+        yield "--target:library" 
+        for x in fileNames do 
+            yield x
+        let references = mkStandardProjectReferences ()
+        for r in references do
+            yield "-r:" + r
+     |]
+
+let getProjectOptionsFromCommandLineArgs(projName, argv): FSharpProjectOptions = 
+      { ProjectFileName = projName
+        ProjectId = None
+        SourceFiles = [| |]
+        OtherOptions = argv
+        ReferencedProjects = [| |]  
+        IsIncompleteTypeCheckEnvironment = false
+        UseScriptResolutionRules = false
+        LoadTime = System.DateTime.MaxValue
+        UnresolvedReferences = None
+        OriginalLoadReferences = []
+        Stamp = None }
+
+let printAst title (projectResults: FSharpCheckProjectResults) =
+    let implFiles = projectResults.AssemblyContents.ImplementationFiles
+    let decls = implFiles
+                |> Seq.collect (fun file -> AstPrint.printFSharpDecls "" file.Declarations)
+                |> String.concat "\n"
+    printfn "%s Typed AST:" title
+    decls |> printfn "%s"
+
+[<EntryPoint>]
+let main argv = 
+    let projName = "Project.fsproj"
+    let fileName = "test_script.fsx"
+    let fileNames = [| fileName |]
+    let source = File.ReadAllText (fileName, System.Text.Encoding.UTF8)
+    let sources =  [| source |]
+
+    let dllName = Path.ChangeExtension(fileName, ".dll")
+    let args = mkProjectCommandLineArgsForScript (dllName, fileNames)
+    // for arg in args do printfn "%s" arg
+
+    let projectOptions = getProjectOptionsFromCommandLineArgs (projName, args)
+    let checker = InteractiveChecker.Create(projectOptions)
+
+    // parse and typecheck a project
+    let sourceReader _key = (1, lazy source)
+    let projectResults = checker.ParseAndCheckProject(projName, fileNames, sourceReader)
+    projectResults.Diagnostics |> Array.iter (fun e -> printfn "%A: %A" (e.Severity) e)
+    printAst "ParseAndCheckProject" projectResults
+
+    // or just parse and typecheck a file in project
+    let parseResults, typeCheckResults, projectResults =
+        checker.ParseAndCheckFileInProject(fileName, projName, fileNames, sources)
+    projectResults.Diagnostics |> Array.iter (fun e -> printfn "%A: %A" (e.Severity) e)
+
+    printAst "ParseAndCheckFileInProject" projectResults
+
+    let inputLines = source.Split('\n')
+
+    // Get tool tip at the specified location
+    let tip = typeCheckResults.GetToolTip(4, 7, inputLines.[3], ["foo"], Tokenization.FSharpTokenTag.IDENT)
+    (sprintf "%A" tip).Replace("\n","") |> printfn "\n---> ToolTip Text = %A" // should print "FSharpToolTipText [...]"
+
+    // Get declarations (autocomplete) for msg
+    let partialName = { QualifyingIdents = []; PartialIdent = "msg"; EndColumn = 17; LastDotPos = None }
+    let decls = typeCheckResults.GetDeclarationListInfo(Some parseResults, 6, inputLines.[5], partialName, (fun _ -> []))
+    [ for item in decls.Items -> item.Name ] |> printfn "\n---> msg AutoComplete = %A" // should print string methods
+
+    // Get declarations (autocomplete) for canvas
+    let partialName = { QualifyingIdents = []; PartialIdent = "canvas"; EndColumn = 10; LastDotPos = None }
+    let decls = typeCheckResults.GetDeclarationListInfo(Some parseResults, 8, inputLines.[7], partialName, (fun _ -> []))
+    [ for item in decls.Items -> item.Name ] |> printfn "\n---> canvas AutoComplete = %A"
+
+    0

fcs/fcs-test/ast_print.fs

@@ -0,0 +1,101 @@
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+module AstPrint
+
+open FSharp.Compiler.Symbols
+
+//-------------------------------------------------------------------------
+// AstPrint
+//-------------------------------------------------------------------------
+
+let attribsOfSymbol (s: FSharpSymbol) =
+    [ match s with
+        | :? FSharpField as v ->
+            yield "field"
+            if v.IsCompilerGenerated then yield "compgen"
+            if v.IsDefaultValue then yield "default"
+            if v.IsMutable then yield "mutable"
+            if v.IsVolatile then yield "volatile"
+            if v.IsStatic then yield "static"
+            if v.IsLiteral then yield sprintf "%A" v.LiteralValue.Value
+
+        | :? FSharpEntity as v ->
+            v.TryFullName |> ignore // check there is no failure here
+            match v.BaseType with
+            | Some t when t.HasTypeDefinition && t.TypeDefinition.TryFullName.IsSome ->
+                yield sprintf "inherits %s" t.TypeDefinition.FullName
+            | _ -> ()
+            if v.IsNamespace then yield "namespace"
+            if v.IsFSharpModule then yield "module"
+            if v.IsByRef then yield "byref"
+            if v.IsClass then yield "class"
+            if v.IsDelegate then yield "delegate"
+            if v.IsEnum then yield "enum"
+            if v.IsFSharpAbbreviation then yield "abbrev"
+            if v.IsFSharpExceptionDeclaration then yield "exception"
+            if v.IsFSharpRecord then yield "record"
+            if v.IsFSharpUnion then yield "union"
+            if v.IsInterface then yield "interface"
+            if v.IsMeasure then yield "measure"
+#if !NO_EXTENSIONTYPING
+            if v.IsProvided then yield "provided"
+            if v.IsStaticInstantiation then yield "static_inst"
+            if v.IsProvidedAndErased then yield "erased"
+            if v.IsProvidedAndGenerated then yield "generated"
+#endif
+            if v.IsUnresolved then yield "unresolved"
+            if v.IsValueType then yield "valuetype"
+
+        | :? FSharpMemberOrFunctionOrValue as v ->
+            yield "owner: " + match v.DeclaringEntity with | Some e -> e.CompiledName | _ -> "<unknown>"
+            if v.IsActivePattern then yield "active_pattern"
+            if v.IsDispatchSlot then yield "dispatch_slot"
+            if v.IsModuleValueOrMember && not v.IsMember then yield "val"
+            if v.IsMember then yield "member"
+            if v.IsProperty then yield "property"
+            if v.IsExtensionMember then yield "extension_member"
+            if v.IsPropertyGetterMethod then yield "property_getter"
+            if v.IsPropertySetterMethod then yield "property_setter"
+            if v.IsEvent then yield "event"
+            if v.EventForFSharpProperty.IsSome then yield "property_event"
+            if v.IsEventAddMethod then yield "event_add"
+            if v.IsEventRemoveMethod then yield "event_remove"
+            if v.IsTypeFunction then yield "type_func"
+            if v.IsCompilerGenerated then yield "compiler_gen"
+            if v.IsImplicitConstructor then yield "implicit_ctor"
+            if v.IsMutable then yield "mutable"
+            if v.IsOverrideOrExplicitInterfaceImplementation then yield "override_impl"
+            if not v.IsInstanceMember then yield "static"
+            if v.IsInstanceMember && not v.IsInstanceMemberInCompiledCode && not v.IsExtensionMember then yield "funky"
+            if v.IsExplicitInterfaceImplementation then yield "interface_impl"
+            yield sprintf "%A" v.InlineAnnotation
+            // if v.IsConstructorThisValue then yield "ctorthis"
+            // if v.IsMemberThisValue then yield "this"
+            // if v.LiteralValue.IsSome then yield "literal"
+        | _ -> () ]
+
+let rec printFSharpDecls prefix decls = seq {
+    let mutable i = 0
+    for decl in decls do
+        i <- i + 1
+        match decl with
+        | FSharpImplementationFileDeclaration.Entity (e, sub) ->
+            yield sprintf "%s%i) ENTITY: %s %A" prefix i e.CompiledName (attribsOfSymbol e)
+            if not (Seq.isEmpty e.Attributes) then
+                yield sprintf "%sattributes: %A" prefix (Seq.toList e.Attributes)
+            if not (Seq.isEmpty e.DeclaredInterfaces) then
+                yield sprintf "%sinterfaces: %A" prefix (Seq.toList e.DeclaredInterfaces)
+            yield ""
+            yield! printFSharpDecls (prefix + "\t") sub
+        | FSharpImplementationFileDeclaration.MemberOrFunctionOrValue (meth, args, body) ->
+            yield sprintf "%s%i) METHOD: %s %A" prefix i meth.CompiledName (attribsOfSymbol meth)
+            yield sprintf "%stype: %A" prefix meth.FullType
+            yield sprintf "%sargs: %A" prefix args
+            // if not meth.IsCompilerGenerated then
+            yield sprintf "%sbody: %A" prefix body
+            yield ""
+        | FSharpImplementationFileDeclaration.InitAction (expr) ->
+            yield sprintf "%s%i) ACTION" prefix i
+            yield sprintf "%s%A" prefix expr
+            yield ""
+}

fcs/fcs-test/fcs-test.fsproj

@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="ast_print.fs"/>
+    <Compile Include="Program.fs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- <ProjectReference Include="../../src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj" /> -->
+    <Reference Include="../../artifacts/bin/FSharp.Compiler.Service/Release/netstandard2.0/FSharp.Core.dll" />
+    <Reference Include="../../artifacts/bin/FSharp.Compiler.Service/Release/netstandard2.0/FSharp.Compiler.Service.dll" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- <PackageReference Include="FSharp.Core" Version="5.0.0" /> -->
+    <PackageReference Include="Dotnet.ProjInfo" Version="0.44.0" />
+    <PackageReference Include="Fable.Core" Version="3.2.6" />
+    <PackageReference Include="Fable.Import.Browser" Version="1.4.0" />
+  </ItemGroup>
+</Project>

fcs/fcs-test/test_script.fsx

@@ -0,0 +1,8 @@
+open System
+open Fable.Import
+
+let foo() =
+    let msg = String.Concat("Hello"," ","world")
+    let len = msg.Length
+    let canvas = Browser.document.createElement_canvas ()
+    canvas.width <- 1000.

src/buildtools/buildtools.targets

@@ -20,7 +20,7 @@
           BeforeTargets="CoreCompile">
 
     <PropertyGroup>
-        <FsLexPath Condition="'$(FsLexPath)' == ''">$(ArtifactsDir)\Bootstrap\fslex\fslex.dll</FsLexPath>
+        <FsLexPath Condition="'$(FsLexPath)' == ''">$(ArtifactsDir)\bin\fslex\Release\net5.0\fslex.dll</FsLexPath>
     </PropertyGroup>
 
     <!-- Create the output directory -->
@@ -44,7 +44,7 @@
           BeforeTargets="CoreCompile">
 
     <PropertyGroup>
-        <FsYaccPath Condition="'$(FsYaccPath)' == ''">$(ArtifactsDir)\Bootstrap\fsyacc\fsyacc.dll</FsYaccPath>
+        <FsYaccPath Condition="'$(FsYaccPath)' == ''">$(ArtifactsDir)\bin\fsyacc\Release\net5.0\fsyacc.dll</FsYaccPath>
     </PropertyGroup>
 
     <!-- Create the output directory -->

src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj

@@ -947,6 +947,7 @@
     <Compile Include="..\LegacyHostedCompilerForTesting.fs" Condition="'$(MonoPackaging)' != 'true'">
       <Link>Misc/LegacyHostedCompilerForTesting.fs</Link>
     </Compile>
+    <Compile Include="service_slim.fs" />
   </ItemGroup>
 
   <ItemGroup>