Initial generation signature feature toggle.

ReSharper.FSharp/src/FSharp.Common/src/Settings/FSharpOptions.fs

@@ -86,7 +86,7 @@ module FSharpExperimentalFeatures =
     let [<Literal>] outOfProcessTypeProviders = "Host type providers out-of-process"
     let [<Literal>] generativeTypeProvidersInMemoryAnalysis = "Enable generative type providers analysis in C#/VB.NET projects"
     let [<Literal>] tryRecoverFcsProjects = "Try to reuse FCS results on project changes"
-
+    let [<Literal>] generateSignatureFile = "Generate signature file"
 
 [<SettingsKey(typeof<FSharpOptions>, "F# experimental features")>]
 type FSharpExperimentalFeatures =
@@ -109,8 +109,10 @@ type FSharpExperimentalFeatures =
       mutable GenerativeTypeProvidersInMemoryAnalysis: bool
 
       [<SettingsEntry(false, FSharpExperimentalFeatures.tryRecoverFcsProjects); DefaultValue>]
-      mutable TryRecoverFcsProjects: bool }
+      mutable TryRecoverFcsProjects: bool
 
+      [<SettingsEntry(false, FSharpExperimentalFeatures.generateSignatureFile); DefaultValue>]
+      mutable GenerateSignatureFile: bool }
 
 [<AllowNullLiteral>]
 type FSharpSettingsProviderBase<'T>(lifetime: Lifetime, settings: IContextBoundSettingsStoreLive,
@@ -146,6 +148,7 @@ type FSharpExperimentalFeaturesProvider(lifetime, solution, settings, settingsSc
     member val OutOfProcessTypeProviders = base.GetValueProperty<bool>("OutOfProcessTypeProviders")
     member val GenerativeTypeProvidersInMemoryAnalysis = base.GetValueProperty<bool>("GenerativeTypeProvidersInMemoryAnalysis")
     member val TryRecoverFcsProjects = base.GetValueProperty<bool>("TryRecoverFcsProjects")
+    member val GenerateSignatureFile = base.GetValueProperty<bool>("GenerateSignatureFile")
 
 
 [<SolutionInstanceComponent>]
@@ -220,6 +223,7 @@ type FSharpOptionsPage(lifetime: Lifetime, optionsPageContext, settings,
             this.AddBoolOption((fun key -> key.PostfixTemplates), RichText(FSharpExperimentalFeatures.postfixTemplates), null) |> ignore
             this.AddBoolOption((fun key -> key.RedundantParensAnalysis), RichText(FSharpExperimentalFeatures.redundantParenAnalysis), null) |> ignore
             this.AddBoolOption((fun key -> key.Formatter), RichText(FSharpExperimentalFeatures.formatter), null) |> ignore
+            this.AddBoolOption((fun key -> key.GenerateSignatureFile), RichText(FSharpExperimentalFeatures.generateSignatureFile)) |> ignore
 
 
 [<ShellComponent>]

ReSharper.FSharp/src/FSharp.Common/src/Util/FSharpExperimentalFeatures.fs

@@ -13,6 +13,7 @@ type ExperimentalFeature =
     | RedundantParenAnalysis = 3
     | AssemblyReaderShim = 4
     | TryRecoverFcsProjects = 5
+    | GenerateSignatureFile = 6
 
 type FSharpExperimentalFeatureCookie(feature: ExperimentalFeature) =
     static let cookies = OneToListMap<ExperimentalFeature, IDisposable>()
@@ -45,6 +46,7 @@ type FSharpExperimentalFeatures() =
         | ExperimentalFeature.PostfixTemplates -> experimentalFeatures.EnablePostfixTemplates.Value
         | ExperimentalFeature.RedundantParenAnalysis -> experimentalFeatures.RedundantParensAnalysis.Value
         | ExperimentalFeature.TryRecoverFcsProjects -> experimentalFeatures.TryRecoverFcsProjects.Value
+        | ExperimentalFeature.GenerateSignatureFile -> experimentalFeatures.GenerateSignatureFile.Value
         | _ -> failwith $"Unexpected feature: {feature}"
 
     [<Extension>]

ReSharper.FSharp/src/FSharp.Psi.Features/src/Parsing/FSharpImplTreeBuilder.fs

@@ -35,11 +35,11 @@ type FSharpImplTreeBuilder(lexer, document, decls, lifetime, path, projectedOffs
         let (SynModuleOrNamespace(lid, _, moduleKind, decls, XmlDoc xmlDoc, attrs, _, range, _)) = moduleOrNamespace
         let mark, elementType = x.StartTopLevelDeclaration(lid, attrs, moduleKind, xmlDoc, range)
         for decl in decls do
-            x.ProcessModuleMemberDeclaration(decl)
+            x.ProcessModuleMemberDeclaration(decl, moduleOrNamespace.Range)
         x.EnsureMembersAreFinished()
         x.FinishTopLevelDeclaration(mark, range, elementType)
 
-    member x.ProcessModuleMemberDeclaration(moduleMember) =
+    member x.ProcessModuleMemberDeclaration(moduleMember, parentRange) =
         match unfinishedDeclaration with
         | None -> ()
         | Some(mark, range, elementType) ->
@@ -53,7 +53,12 @@ type FSharpImplTreeBuilder(lexer, document, decls, lifetime, path, projectedOffs
         | SynModuleDecl.NestedModule(SynComponentInfo(attrs, _, _, _, XmlDoc xmlDoc, _, _, _), _, decls, _, range, _) ->
             let mark = x.MarkAndProcessIntro(attrs, xmlDoc, null, range)
             for decl in decls do
-                x.ProcessModuleMemberDeclaration(decl)
+                x.ProcessModuleMemberDeclaration(decl, parentRange)
+
+            if decls.IsEmpty then
+                x.AdvanceToTokenOrRangeEnd(FSharpTokenType.END, parentRange)
+                x.Advance()
+
             x.Done(range, mark, ElementType.NESTED_MODULE_DECLARATION)
 
         | SynModuleDecl.Types(typeDefns, range) ->

ReSharper.FSharp/src/FSharp.Psi.Features/src/Parsing/FSharpParser.fs

@@ -56,6 +56,9 @@ type FSharpParser(lexer: ILexer, document: IDocument, path: VirtualFileSystemPat
                                      ResolvedSymbolsCache = symbolsCache,
                                      LanguageType = language)
 
+    static member val SandBoxPath = VirtualFileSystemPath.Parse("Sandbox.fs", InteractionContext.SolutionContext)
+    static member val SandBoxSignaturePath = VirtualFileSystemPath.Parse("Sandbox.fsi", InteractionContext.SolutionContext)
+
     new (lexer, [<NotNull>] sourceFile: IPsiSourceFile, checkerService, symbolsCache) =
         // During rename of type + file the source file returns the new path,
         // but the parsing/project options still have the old one. It doesn't seem to affect anything.
@@ -75,9 +78,6 @@ type FSharpParser(lexer: ILexer, document: IDocument, path: VirtualFileSystemPat
 
         FSharpParser(lexer, document, path, sourceFile, checkerService, symbolsCache)
 
-    static member val SandBoxPath = VirtualFileSystemPath.Parse("Sandbox.fs", InteractionContext.SolutionContext)
-    static member val SandBoxSignaturePath = VirtualFileSystemPath.Parse("Sandbox.fsi", InteractionContext.SolutionContext)
-
     interface IFSharpParser with
         member this.ParseFSharpFile(noCache) = parseFile noCache
         member this.ParseFile() = parseFile false :> _

ReSharper.FSharp/src/FSharp.Psi.Services/FSharp.Psi.Services.fsproj

@@ -64,6 +64,7 @@
     <Compile Include="src\Generate\FSharpGeneratorContext.fs" />
     <Compile Include="src\Generate\GenerateOverrides.fs" />
     <Compile Include="src\Generate\GenerateProvider.fs" />
+    <Compile Include="src\Generate\GenerateSignatureProvider.fs" />
     <Compile Include="src\Refactorings\Rename.fs" />
     <Compile Include="src\Refactorings\IntroduceVariable.fs" />
     <Compile Include="src\Refactorings\FSharpInlineVariable.fs" />

ReSharper.FSharp/src/FSharp.Psi.Services/src/Generate/FSharpGeneratorContext.fs

@@ -26,7 +26,7 @@ type FSharpGeneratorContext(kind, [<NotNull>] treeNode: ITreeNode, [<CanBeNull>]
 
     override x.Language = FSharpLanguage.Instance :> _
 
-    override x.Root = typeDecl :> _
+    override x.Root = treeNode
     override val Anchor = null with get, set
 
     override x.PsiModule = treeNode.GetPsiModule()