Skip to content

Commit

Permalink
Add FSharpWorkspace to FCS (#18032)
Browse files Browse the repository at this point in the history
  • Loading branch information
0101 authored Dec 3, 2024
1 parent 11316da commit 6a61fc7
Show file tree
Hide file tree
Showing 20 changed files with 1,745 additions and 156 deletions.
1 change: 1 addition & 0 deletions .fantomasignore
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ src/Compiler/Utilities/illib.fs


src/Compiler/Utilities/NullnessShims.fs
src/Compiler/Utilities/DependencyGraph.fs
src/Compiler/Utilities/LruCache.fsi
src/Compiler/Utilities/LruCache.fs
src/Compiler/Utilities/HashMultiMap.fsi
Expand Down
10 changes: 7 additions & 3 deletions src/Compiler/FSharp.Compiler.Service.fsproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -->
<Project Sdk="Microsoft.NET.Sdk">

Expand All @@ -16,7 +16,7 @@
<AllowCrossTargeting>true</AllowCrossTargeting>
<DefineConstants>$(DefineConstants);COMPILER</DefineConstants>
<CheckNulls>true</CheckNulls>
<!-- Nullness checking against ns20 base class libraries is very weak, the APIs were not updated with annotations.
<!-- Nullness checking against ns20 base class libraries is very weak, the APIs were not updated with annotations.
Therefore we want to use the latest BCL APIs from NetCurrent.
We are still not building the actual product in NetCurrent, so for official builds we remain as ns2.0.
For 'BUILDING_USING_DOTNET' builds, we still want latest BCL annotations, so that contributors can get related warnings locally.
Expand Down Expand Up @@ -113,7 +113,7 @@
<EmbeddedResource Include="FSStrings.resx">
<Link>FSStrings.resx</Link>
<LogicalName>FSStrings.resources</LogicalName>
</EmbeddedResource>
</EmbeddedResource>
<Compile Include="Utilities\Activity.fsi" />
<Compile Include="Utilities\Activity.fs" />
<Compile Include="Utilities\illib.fsi" />
Expand Down Expand Up @@ -148,6 +148,7 @@
<Compile Include="Utilities\QueueList.fs" />
<Compile Include="Utilities\lib.fsi" />
<Compile Include="Utilities\lib.fs" />
<Compile Include="Utilities\DependencyGraph.fs" />
<Compile Include="Utilities\LruCache.fsi" />
<Compile Include="Utilities\LruCache.fs" />
<Compile Include="Utilities\ImmutableArray.fsi" />
Expand Down Expand Up @@ -541,6 +542,9 @@
<Compile Include="Service\TransparentCompiler.fs" />
<Compile Include="Service\service.fsi" />
<Compile Include="Service\service.fs" />
<Compile Include="Service\FSharpWorkspaceState.fs" />
<Compile Include="Service\FSharpWorkspaceQuery.fs" />
<Compile Include="Service\FSharpWorkspace.fs" />
<Compile Include="Service\ServiceInterfaceStubGenerator.fsi" />
<Compile Include="Service\ServiceInterfaceStubGenerator.fs" />
<Compile Include="Service\ServiceStructure.fsi" />
Expand Down
1 change: 1 addition & 0 deletions src/Compiler/Facilities/AsyncMemoize.fs
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ type internal JobEvent =
static member AllEvents = [Requested; Started; Restarted; Finished; Canceled; Evicted; Collected; Weakened; Strengthened; Failed; Cleared]

type internal ICacheKey<'TKey, 'TVersion> =
// TODO Key should probably be renamed to Identifier
abstract member GetKey: unit -> 'TKey
abstract member GetVersion: unit -> 'TVersion
abstract member GetLabel: unit -> string
Expand Down
Loading

0 comments on commit 6a61fc7

Please sign in to comment.