Skip to content

implement interfaces directly in FSharpKernel #910

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
brettfo merged 1 commit into from
Nov 26, 2020
Merged

implement interfaces directly in FSharpKernel #910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 0 additions & 15 deletions dotnet-interactive.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "integration-tests", "integr
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "interface-generator", "src\interface-generator\interface-generator.csproj", "{9A091E80-D5EB-4DEF-8E38-B24B128393DF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Interactive.FSharp.Wrapper", "src\Microsoft.DotNet.Interactive.FSharp.Wrapper\Microsoft.DotNet.Interactive.FSharp.Wrapper.csproj", "{89672116-94E4-4F17-A64A-AA049410F595}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{4DD50BCA-133B-4594-8368-ED56939BAF6B}"
ProjectSection(SolutionItems) = preProject
docs\CreateBinder.md = docs\CreateBinder.md
Expand Down Expand Up @@ -350,18 +348,6 @@ Global
{9A091E80-D5EB-4DEF-8E38-B24B128393DF}.Release|x64.Build.0 = Release|Any CPU
{9A091E80-D5EB-4DEF-8E38-B24B128393DF}.Release|x86.ActiveCfg = Release|Any CPU
{9A091E80-D5EB-4DEF-8E38-B24B128393DF}.Release|x86.Build.0 = Release|Any CPU
{89672116-94E4-4F17-A64A-AA049410F595}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{89672116-94E4-4F17-A64A-AA049410F595}.Debug|Any CPU.Build.0 = Debug|Any CPU
{89672116-94E4-4F17-A64A-AA049410F595}.Debug|x64.ActiveCfg = Debug|Any CPU
{89672116-94E4-4F17-A64A-AA049410F595}.Debug|x64.Build.0 = Debug|Any CPU
{89672116-94E4-4F17-A64A-AA049410F595}.Debug|x86.ActiveCfg = Debug|Any CPU
{89672116-94E4-4F17-A64A-AA049410F595}.Debug|x86.Build.0 = Debug|Any CPU
{89672116-94E4-4F17-A64A-AA049410F595}.Release|Any CPU.ActiveCfg = Release|Any CPU
{89672116-94E4-4F17-A64A-AA049410F595}.Release|Any CPU.Build.0 = Release|Any CPU
{89672116-94E4-4F17-A64A-AA049410F595}.Release|x64.ActiveCfg = Release|Any CPU
{89672116-94E4-4F17-A64A-AA049410F595}.Release|x64.Build.0 = Release|Any CPU
{89672116-94E4-4F17-A64A-AA049410F595}.Release|x86.ActiveCfg = Release|Any CPU
{89672116-94E4-4F17-A64A-AA049410F595}.Release|x86.Build.0 = Release|Any CPU
{DE942DC3-B41B-45C5-9E01-3C4F042D3916}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DE942DC3-B41B-45C5-9E01-3C4F042D3916}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DE942DC3-B41B-45C5-9E01-3C4F042D3916}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -401,7 +387,6 @@ Global
{30DE6920-EA82-4E4F-BFCA-1FF179FAA2DA} = {11BA3480-4584-435C-BA9A-8C554DB60E9F}
{8017943B-B591-49C8-B957-40141B427AD9} = {979A5022-09CA-4258-B76D-CFDC31DA71E0}
{9A091E80-D5EB-4DEF-8E38-B24B128393DF} = {B95A8485-8C53-4F56-B0CE-19C0726B5805}
{89672116-94E4-4F17-A64A-AA049410F595} = {B95A8485-8C53-4F56-B0CE-19C0726B5805}
{DE942DC3-B41B-45C5-9E01-3C4F042D3916} = {B95A8485-8C53-4F56-B0CE-19C0726B5805}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
Expand Down
2 changes: 1 addition & 1 deletion ...Net.Interactive.ExtensionLab.Tests/Microsoft.DotNet.Interactive.ExtensionLab.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Microsoft.DotNet.Interactive.FSharp.Wrapper\Microsoft.DotNet.Interactive.FSharp.Wrapper.csproj" />
<ProjectReference Include="..\Microsoft.DotNet.Interactive.ExtensionLab\Microsoft.DotNet.Interactive.ExtensionLab.csproj" />
<ProjectReference Include="..\Microsoft.DotNet.Interactive.CSharp\Microsoft.DotNet.Interactive.CSharp.csproj" />
<ProjectReference Include="..\Microsoft.DotNet.Interactive.FSharp\Microsoft.DotNet.Interactive.FSharp.fsproj" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion ...icrosoft.DotNet.Interactive.FSharp.Tests/Microsoft.DotNet.Interactive.FSharp.Tests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
<ItemGroup />

<ItemGroup>
<ProjectReference Include="..\Microsoft.DotNet.Interactive.FSharp.Wrapper\Microsoft.DotNet.Interactive.FSharp.Wrapper.csproj" />
<ProjectReference Include="..\Microsoft.DotNet.Interactive.FSharp\Microsoft.DotNet.Interactive.FSharp.fsproj" />
</ItemGroup>

Expand Down
26 changes: 0 additions & 26 deletions src/Microsoft.DotNet.Interactive.FSharp.Wrapper/FSharpKernel.cs
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions ...soft.DotNet.Interactive.FSharp.Wrapper/Microsoft.DotNet.Interactive.FSharp.Wrapper.csproj
View file
Open in desktop

This file was deleted.

21 changes: 10 additions & 11 deletions src/Microsoft.DotNet.Interactive.FSharp/FSharpKernel.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ open FSharp.Compiler.Scripting
open FSharp.Compiler.SourceCodeServices
open FsAutoComplete

[<AbstractClass>]
type FSharpKernelBase () as this =
type FSharpKernel () as this =

inherit DotNetKernel("fsharp")

Expand Down Expand Up @@ -386,17 +385,17 @@ type FSharpKernelBase () as this =

member _.PackageRestoreContext = _packageRestoreContext.Value

// ideally via IKernelCommandHandler<RequestCompletion>, but requires https://github.com/dotnet/fsharp/pull/2867
member _.HandleRequestCompletionAsync(command: RequestCompletions, context: KernelInvocationContext) = handleRequestCompletions command context |> Async.StartAsTask :> Task
interface IKernelCommandHandler<RequestCompletions> with
member this.HandleAsync(command: RequestCompletions, context: KernelInvocationContext) = handleRequestCompletions command context |> Async.StartAsTask :> Task

// ideally via IKernelCommandHandler<RequestDiagnostics, but requires https://github.com/dotnet/fsharp/pull/2867
member _.HandleRequestDiagnosticsAsync(command: RequestDiagnostics, context: KernelInvocationContext) = handleRequestDiagnostics command context |> Async.StartAsTask :> Task

// ideally via IKernelCommandHandler<RequestHoverText, but requires https://github.com/dotnet/fsharp/pull/2867
member _.HandleRequestHoverText(command: RequestHoverText, context: KernelInvocationContext) = handleRequestHoverText command context |> Async.StartAsTask :> Task
interface IKernelCommandHandler<RequestDiagnostics> with
member this.HandleAsync(command: RequestDiagnostics, context: KernelInvocationContext) = handleRequestDiagnostics command context |> Async.StartAsTask :> Task

// ideally via IKernelCommandHandler<SubmitCode, but requires https://github.com/dotnet/fsharp/pull/2867
member _.HandleSubmitCodeAsync(command: SubmitCode, context: KernelInvocationContext) = handleSubmitCode command context |> Async.StartAsTask :> Task
interface IKernelCommandHandler<RequestHoverText> with
member this.HandleAsync(command: RequestHoverText, context: KernelInvocationContext) = handleRequestHoverText command context |> Async.StartAsTask :> Task

interface IKernelCommandHandler<SubmitCode> with
member this.HandleAsync(command: SubmitCode, context: KernelInvocationContext) = handleSubmitCode command context |> Async.StartAsTask :> Task

interface ISupportNuget with
member _.AddRestoreSource(source: string) =
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.DotNet.Interactive.FSharp/FSharpKernelExtensions.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ type FSharpKernelExtensions private () =
static let openNamespaceOrType (whatToOpen: string) = sprintf "open %s" whatToOpen

[<Extension>]
static member UseDefaultFormatting(kernel: FSharpKernelBase) =
static member UseDefaultFormatting(kernel: FSharpKernel) =
let code =
[
referenceFromType typeof<IHtmlContent>
Expand All @@ -35,12 +35,12 @@ type FSharpKernelExtensions private () =
kernel

[<Extension>]
static member UseDefaultNamespaces(kernel: FSharpKernelBase) =
static member UseDefaultNamespaces(kernel: FSharpKernel) =
// F# has its own views on what namespaces are open by default in its scripting model
kernel

[<Extension>]
static member UseKernelHelpers(kernel: FSharpKernelBase) =
static member UseKernelHelpers(kernel: FSharpKernel) =
let code =
[
referenceFromType typeof<FSharpKernelHelpers.IMarker>
Expand Down
3 changes: 0 additions & 3 deletions src/Microsoft.DotNet.Interactive.FSharp/Microsoft.DotNet.Interactive.FSharp.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@

<PropertyGroup>
<IsPackable>true</IsPackable>
<!-- The Microsoft.DotNet.Interactive.FSharp.Wrapper project is the package entry point. -->
<PackageId>Microsoft.DotNet.Interactive.FSharp.Internal</PackageId>
<!-- -->
<PackageDescription>Microsoft.DotNet.Interactive.Kernel implementation for F#</PackageDescription>
<PackageTags>interactive fsharp</PackageTags>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.Interactive.Jupyter.Tests/JupyterRequestHandlerTestBase{T}.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public abstract class JupyterRequestHandlerTestBase : IDisposable
{
private readonly CompositeDisposable _disposables = new CompositeDisposable();
private readonly CSharpKernel _cSharpKernel;
private readonly FSharpKernelBase _fSharpKernel;
private readonly FSharpKernel _fSharpKernel;
private readonly PowerShellKernel _psKernel;
private readonly CompositeKernel _compositeKernel;

Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.Interactive.Jupyter/JupyterFormattingKernelExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public static CSharpKernel UseMathAndLaTeX(this CSharpKernel kernel)
return kernel;
}

public static FSharpKernelBase UseMathAndLaTeX(this FSharpKernelBase kernel)
public static FSharpKernel UseMathAndLaTeX(this FSharpKernel kernel)
{
if (kernel == null)
{
Expand Down
1 change: 0 additions & 1 deletion src/Microsoft.DotNet.Interactive.Jupyter/Microsoft.DotNet.Interactive.Jupyter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Microsoft.DotNet.Interactive.CSharp\Microsoft.DotNet.Interactive.CSharp.csproj" />
<ProjectReference Include="..\Microsoft.DotNet.Interactive.FSharp.Wrapper\Microsoft.DotNet.Interactive.FSharp.Wrapper.csproj" />
<ProjectReference Include="..\Microsoft.DotNet.Interactive.FSharp\Microsoft.DotNet.Interactive.FSharp.fsproj" />
<ProjectReference Include="..\Microsoft.DotNet.Interactive.PowerShell\Microsoft.DotNet.Interactive.PowerShell.csproj" />
<ProjectReference Include="..\Microsoft.DotNet.Interactive\Microsoft.DotNet.Interactive.csproj" />
Expand Down
1 change: 0 additions & 1 deletion src/Microsoft.DotNet.Interactive.Tests/Microsoft.DotNet.Interactive.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@

<ItemGroup>
<ProjectReference Include="..\Microsoft.DotNet.Interactive.CSharp\Microsoft.DotNet.Interactive.CSharp.csproj" />
<ProjectReference Include="..\Microsoft.DotNet.Interactive.FSharp.Wrapper\Microsoft.DotNet.Interactive.FSharp.Wrapper.csproj" />
<ProjectReference Include="..\Microsoft.DotNet.Interactive.FSharp\Microsoft.DotNet.Interactive.FSharp.fsproj" />
<ProjectReference Include="..\Microsoft.DotNet.Interactive.PowerShell\Microsoft.DotNet.Interactive.PowerShell.csproj" />
<ProjectReference Include="..\Microsoft.DotNet.Interactive.Jupyter\Microsoft.DotNet.Interactive.Jupyter.csproj" />
Expand Down
1 change: 0 additions & 1 deletion src/dotnet-interactive.Profiler/dotnet-interactive.Profiler.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
<ItemGroup>
<ProjectReference Include="..\dotnet-interactive\dotnet-interactive.csproj" />
<ProjectReference Include="..\Microsoft.DotNet.Interactive.Formatting\Microsoft.DotNet.Interactive.Formatting.csproj" />
<ProjectReference Include="..\Microsoft.DotNet.Interactive.FSharp.Wrapper\Microsoft.DotNet.Interactive.FSharp.Wrapper.csproj" />
<ProjectReference Include="..\Microsoft.DotNet.Interactive.FSharp\Microsoft.DotNet.Interactive.FSharp.fsproj" />
<ProjectReference Include="..\Microsoft.DotNet.Interactive.Jupyter\Microsoft.DotNet.Interactive.Jupyter.csproj" />
<ProjectReference Include="..\Microsoft.DotNet.Interactive\Microsoft.DotNet.Interactive.csproj" />
Expand Down
1 change: 0 additions & 1 deletion src/dotnet-interactive/dotnet-interactive.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@

<ItemGroup>
<ProjectReference Include="..\Microsoft.DotNet.Interactive.CSharp\Microsoft.DotNet.Interactive.CSharp.csproj" />
<ProjectReference Include="..\Microsoft.DotNet.Interactive.FSharp.Wrapper\Microsoft.DotNet.Interactive.FSharp.Wrapper.csproj" />
<ProjectReference Include="..\Microsoft.DotNet.Interactive.FSharp\Microsoft.DotNet.Interactive.FSharp.fsproj" />
<ProjectReference Include="..\Microsoft.DotNet.Interactive.Http\Microsoft.DotNet.Interactive.Http.csproj" />
<ProjectReference Include="..\Microsoft.DotNet.Interactive.PowerShell\Microsoft.DotNet.Interactive.PowerShell.csproj" />
Expand Down