[RFC FS-1068] open static classes (#6807)

dsyme · KevinRansom · commit 274c9a04dae9 · 2019-07-09T16:50:52.000-07:00
* open static classes feature * add missing change back * Update dependencies from https://github.com/dotnet/arcade build 20190704.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19354.2 * support struct tuple in leaf expression converter (#7144) * Update dependencies from https://github.com/dotnet/arcade build 20190705.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19355.2 * Update dependencies from https://github.com/dotnet/arcade build 20190706.1 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19356.1 * fix merge
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -3,9 +3,9 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19353.19">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19356.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>733f8297b68dd824044a77d955e62305b9dc43d5</Sha>
+      <Sha>a65d0966dc28861394ce78cfdcb9d5dff370957c</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/global.json b/global.json
@@ -10,7 +10,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19353.19",
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19356.1",
     "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2"
   }
 }
diff --git a/src/fsharp/ErrorLogger.fs b/src/fsharp/ErrorLogger.fs
@@ -671,7 +671,7 @@ type public FSharpErrorSeverityOptions =
 
 
 // See https://github.com/Microsoft/visualfsharp/issues/6417, if a compile of the FSharp.Compiler.Services.dll or other compiler
-// binary produces exactly 65536 methods then older versions of the compiler raise a bug.  If you hit this bug again then try removing
-// this.
-let dummyMethodFOrBug6417A() = () 
-let dummyMethodFOrBug6417B() = () 
+// binary produces exactly 65536 methods then older versions of the compiler raise a bug.  If you hit this bug again then try adding
+// this back in.
+// let dummyMethodFOrBug6417A() = () 
+// let dummyMethodFOrBug6417B() = () 
diff --git a/src/fsharp/ExtensionTyping.fs b/src/fsharp/ExtensionTyping.fs
@@ -415,6 +415,7 @@ module internal ExtensionTyping =
         member __.IsEnum = x.IsEnum
         member __.IsClass = x.IsClass
         member __.IsSealed = x.IsSealed
+        member __.IsAbstract = x.IsAbstract
         member __.IsInterface = x.IsInterface
         member __.GetArrayRank() = x.GetArrayRank()
         member __.GenericParameterPosition = x.GenericParameterPosition
diff --git a/src/fsharp/ExtensionTyping.fsi b/src/fsharp/ExtensionTyping.fsi
@@ -120,6 +120,7 @@ module internal ExtensionTyping =
         member IsInterface : bool
         member IsClass : bool
         member IsSealed : bool
+        member IsAbstract : bool
         member IsPublic : bool
         member IsNestedPublic : bool
         member GenericParameterPosition : int
diff --git a/src/fsharp/NameResolution.fs b/src/fsharp/NameResolution.fs
diff --git a/src/fsharp/NameResolution.fsi b/src/fsharp/NameResolution.fsi
@@ -201,7 +201,7 @@ val internal AddModuleOrNamespaceRefsToNameEnv                   : TcGlobals ->
 val internal AddModuleOrNamespaceRefToNameEnv                    : TcGlobals -> ImportMap -> range -> bool -> AccessorDomain -> NameResolutionEnv -> ModuleOrNamespaceRef -> NameResolutionEnv
 
 /// Add a list of modules or namespaces to the name resolution environment
-val internal AddModulesAndNamespacesContentsToNameEnv : TcGlobals -> ImportMap -> AccessorDomain -> range -> bool -> NameResolutionEnv -> ModuleOrNamespaceRef list -> NameResolutionEnv
+val internal AddEntitiesContentsToNameEnv : TcGlobals -> ImportMap -> AccessorDomain -> range -> bool -> NameResolutionEnv -> ModuleOrNamespaceRef list -> NameResolutionEnv
 
 /// A flag which indicates if it is an error to have two declared type parameters with identical names
 /// in the name resolution environment.
@@ -468,8 +468,8 @@ type PermitDirectReferenceToGeneratedType =
     | Yes 
     | No
 
-/// Resolve a long identifier to a namespace or module.
-val internal ResolveLongIndentAsModuleOrNamespace   : TcResultsSink -> ResultCollectionSettings -> Import.ImportMap -> range -> bool -> FullyQualifiedFlag -> NameResolutionEnv -> AccessorDomain -> Ident -> Ident list -> isOpenDecl: bool -> ResultOrException<(int * ModuleOrNamespaceRef * ModuleOrNamespaceType) list >
+/// Resolve a long identifier to a namespace, module or static class.
+val internal ResolveLongIndentAsModuleOrNamespaceOrStaticClass   : TcResultsSink -> ResultCollectionSettings -> Import.ImportMap -> range -> allowStaticClasses: bool -> first: bool -> FullyQualifiedFlag -> NameResolutionEnv -> AccessorDomain -> Ident -> Ident list -> isOpenDecl: bool -> ResultOrException<(int * ModuleOrNamespaceRef * ModuleOrNamespaceType) list >
 
 /// Resolve a long identifier to an object constructor.
 val internal ResolveObjectConstructor               : NameResolver -> DisplayEnv -> range -> AccessorDomain -> TType -> ResultOrException<Item>
diff --git a/src/fsharp/TastOps.fs b/src/fsharp/TastOps.fs
@@ -8941,3 +8941,19 @@ let isThreadOrContextStatic g attrs =
 let mkUnitDelayLambda (g: TcGlobals) m e =
     let uv, _ = mkCompGenLocal m "unitVar" g.unit_ty
     mkLambda m uv (e, tyOfExpr g e) 
+
+
+let isStaticClass (g:TcGlobals) (x: EntityRef) =
+    not x.IsModuleOrNamespace &&
+    x.TyparsNoRange.IsEmpty &&
+    ((x.IsILTycon && 
+      x.ILTyconRawMetadata.IsSealed &&
+      x.ILTyconRawMetadata.IsAbstract) 
+#if !NO_EXTENSIONTYPING
+     || (x.IsProvided &&
+        match x.TypeReprInfo with 
+        | TProvidedTypeExtensionPoint info -> info.IsSealed && info.IsAbstract 
+        | _ -> false)
+#endif
+     || (not x.IsILTycon && not x.IsProvided && HasFSharpAttribute g g.attrib_AbstractClassAttribute x.Attribs)) &&
+    not (HasFSharpAttribute g g.attrib_RequireQualifiedAccessAttribute x.Attribs)
diff --git a/src/fsharp/TastOps.fsi b/src/fsharp/TastOps.fsi
@@ -2295,3 +2295,4 @@ val isThreadOrContextStatic: TcGlobals -> Attrib list -> bool
 
 val mkUnitDelayLambda: TcGlobals -> range -> Expr -> Expr
 
+val isStaticClass: g: TcGlobals -> tcref: TyconRef -> bool
diff --git a/src/fsharp/TypeChecker.fs b/src/fsharp/TypeChecker.fs
@@ -371,11 +371,11 @@ let AddLocalTyconsAndReport tcSink scopem g amap m tycons env =
     CallEnvSink tcSink (scopem, env.NameEnv, env.eAccessRights)
     env
 
-/// Adjust the TcEnv to account for opening the set of modules and namespaces implied by an `open` declaration
-let OpenModulesOrNamespaces tcSink g amap scopem root env mvvs openDeclaration =
+/// Adjust the TcEnv to account for opening the set of modules, namespaces or static classes implied by an `open` declaration
+let OpenEntities tcSink g amap scopem root env mvvs openDeclaration =
     let env =
         if isNil mvvs then env else
-        { env with eNameResEnv = AddModulesAndNamespacesContentsToNameEnv g amap env.eAccessRights scopem root env.eNameResEnv mvvs }
+        { env with eNameResEnv = AddEntitiesContentsToNameEnv g amap env.eAccessRights scopem root env.eNameResEnv mvvs }
     CallEnvSink tcSink (scopem, env.NameEnv, env.eAccessRights)
     CallOpenDeclarationSink tcSink openDeclaration
     env
@@ -645,11 +645,11 @@ let ImplicitlyOpenOwnNamespace tcSink g amap scopem enclosingNamespacePath env =
         match enclosingNamespacePathToOpen with
         | id :: rest ->
             let ad = env.eAccessRights
-            match ResolveLongIndentAsModuleOrNamespace tcSink ResultCollectionSettings.AllResults amap scopem true OpenQualified env.eNameResEnv ad id rest true with 
+            match ResolveLongIndentAsModuleOrNamespaceOrStaticClass tcSink ResultCollectionSettings.AllResults amap scopem true true OpenQualified env.eNameResEnv ad id rest true with 
             | Result modrefs -> 
                 let modrefs = List.map p23 modrefs
                 let openDecl = OpenDeclaration.Create (enclosingNamespacePathToOpen, modrefs, scopem, true)
-                OpenModulesOrNamespaces tcSink g amap scopem false env modrefs openDecl
+                OpenEntities tcSink g amap scopem false env modrefs openDecl
             | Exception _ -> env
         | _ -> env
 
@@ -6884,7 +6884,7 @@ and TcConstExpr cenv overallTy env m tpenv c =
         let expr = 
             let modName = "NumericLiteral" + suffix
             let ad = env.eAccessRights
-            match ResolveLongIndentAsModuleOrNamespace cenv.tcSink ResultCollectionSettings.AtMostOneResult cenv.amap m true OpenQualified env.eNameResEnv ad (ident (modName, m)) [] false with 
+            match ResolveLongIndentAsModuleOrNamespaceOrStaticClass cenv.tcSink ResultCollectionSettings.AtMostOneResult cenv.amap m true true OpenQualified env.eNameResEnv ad (ident (modName, m)) [] false with 
             | Result []
             | Exception _ -> error(Error(FSComp.SR.tcNumericLiteralRequiresModule modName, m))
             | Result ((_, mref, _) :: _) -> 
@@ -8774,7 +8774,7 @@ and TcNameOfExpr cenv env tpenv (synArg: SynExpr) =
         | LongOrSingleIdent (false, (LongIdentWithDots(longId, _) as lidd), _, _) when longId.Length > 0 ->
             let ad = env.eAccessRights
             let id, rest = List.headAndTail longId
-            match ResolveLongIndentAsModuleOrNamespace cenv.tcSink ResultCollectionSettings.AllResults cenv.amap m true OpenQualified env.eNameResEnv ad id rest true with 
+            match ResolveLongIndentAsModuleOrNamespaceOrStaticClass cenv.tcSink ResultCollectionSettings.AllResults cenv.amap m false true OpenQualified env.eNameResEnv ad id rest true with 
             | Result modref when delayed.IsEmpty && modref |> List.exists (p23 >> IsEntityAccessible cenv.amap m ad) -> 
                 () // resolved to a module or namespace, done with checks
             | _ -> 
@@ -12642,19 +12642,19 @@ let TcTyconMemberSpecs cenv env containerInfo declKind tpenv (augSpfn: SynMember
 // Bind 'open' declarations
 //------------------------------------------------------------------------- 
 
-let TcModuleOrNamespaceLidAndPermitAutoResolve tcSink env amap (longId: Ident list) =
+let TcOpenLidAndPermitAutoResolve tcSink env amap (longId : Ident list) =
     let ad = env.eAccessRights
     match longId with
     | [] -> []
     | id :: rest ->
         let m = longId |> List.map (fun id -> id.idRange) |> List.reduce unionRanges
-        match ResolveLongIndentAsModuleOrNamespace tcSink ResultCollectionSettings.AllResults amap m true OpenQualified env.eNameResEnv ad id rest true with 
+        match ResolveLongIndentAsModuleOrNamespaceOrStaticClass tcSink ResultCollectionSettings.AllResults amap m true true OpenQualified env.eNameResEnv ad id rest true with 
         | Result res -> res
         | Exception err ->
             errorR(err); []
 
 let TcOpenDecl tcSink (g: TcGlobals) amap m scopem env (longId: Ident list) = 
-    match TcModuleOrNamespaceLidAndPermitAutoResolve tcSink env amap longId with
+    match TcOpenLidAndPermitAutoResolve tcSink env amap longId with
     | [] -> env
     | modrefs ->
 
@@ -12706,7 +12706,7 @@ let TcOpenDecl tcSink (g: TcGlobals) amap m scopem env (longId: Ident list) =
     modrefs |> List.iter (fun modref -> CheckEntityAttributes g modref m |> CommitOperationResult)        
 
     let openDecl = OpenDeclaration.Create (longId, modrefs, scopem, false)
-    let env = OpenModulesOrNamespaces tcSink g amap scopem false env modrefs openDecl
+    let env = OpenEntities tcSink g amap scopem false env modrefs openDecl
     env    
 
 
@@ -14181,7 +14181,7 @@ module MutRecBindingChecking =
         let resolved =
             match p with
             | [] -> Result []
-            | id :: rest -> ResolveLongIndentAsModuleOrNamespace cenv.tcSink ResultCollectionSettings.AllResults cenv.amap m true OpenQualified env.eNameResEnv ad id rest false
+            | id :: rest -> ResolveLongIndentAsModuleOrNamespaceOrStaticClass cenv.tcSink ResultCollectionSettings.AllResults cenv.amap m false true OpenQualified env.eNameResEnv ad id rest false
         let mvvs = ForceRaise resolved
         if isNil mvvs then env else
         let modrefs = mvvs |> List.map p23
@@ -17008,7 +17008,7 @@ let rec TcSignatureElementNonMutRec cenv parent typeNames endm (env: TcEnv) synS
             let resolved =
                 match p with
                 | [] -> Result []
-                | id :: rest -> ResolveLongIndentAsModuleOrNamespace cenv.tcSink ResultCollectionSettings.AllResults cenv.amap m true OpenQualified env.eNameResEnv ad id rest false
+                | id :: rest -> ResolveLongIndentAsModuleOrNamespaceOrStaticClass cenv.tcSink ResultCollectionSettings.AllResults cenv.amap m false true OpenQualified env.eNameResEnv ad id rest false
             let mvvs = ForceRaise resolved
             let scopem = unionRanges m endm
             let unfilteredModrefs = mvvs |> List.map p23
@@ -17562,7 +17562,7 @@ let ApplyAssemblyLevelAutoOpenAttributeToTcEnv g amap (ccu: CcuThunk) scopem env
     | ValueNone -> warn()
     | ValueSome _ -> 
         let openDecl = OpenDeclaration.Create ([], [modref], scopem, false)
-        OpenModulesOrNamespaces TcResultsSink.NoSink g amap scopem root env [modref] openDecl
+        OpenEntities TcResultsSink.NoSink g amap scopem root env [modref] openDecl
 
 // Add the CCU and apply the "AutoOpen" attributes
 let AddCcuToTcEnv(g, amap, scopem, env, assemblyName, ccu, autoOpens, internalsVisible) = 
diff --git a/src/fsharp/service/FSharpCheckerResults.fs b/src/fsharp/service/FSharpCheckerResults.fs
@@ -850,7 +850,12 @@ type internal TypeCheckInfo
             | Some(CompletionContext.OpenDeclaration) ->
                 GetDeclaredItems (parseResultsOpt, lineStr, origLongIdentOpt, colAtEndOfNamesAndResidue, residueOpt, lastDotPos, line, loc, filterCtors, resolveOverloads, hasTextChangedSinceLastTypecheck, false, getAllSymbols)
                 |> Option.map (fun (items, denv, m) ->
-                    items |> List.filter (fun x -> match x.Item with Item.ModuleOrNamespaces _ -> true | _ -> false), denv, m)
+                    items 
+                    |> List.filter (fun x ->
+                        match x.Item with
+                        | Item.ModuleOrNamespaces _ -> true
+                        | Item.Types (_, tcrefs) when tcrefs |> List.exists (fun ty -> isAppTy g ty && isStaticClass g (tcrefOfAppTy g ty)) -> true
+                        | _ -> false), denv, m)
             
             // Completion at '(x: ...)"
             | Some (CompletionContext.PatternType) ->
diff --git a/src/fsharp/tast.fs b/src/fsharp/tast.fs
@@ -1446,7 +1446,10 @@ and
       IsSealed: bool 
 
       /// A flag read eagerly from the provided type and used to compute basic properties of the type definition.
-      IsInterface: bool 
+      IsAbstract:  bool 
+
+      /// A flag read eagerly from the provided type and used to compute basic properties of the type definition.
+      IsInterface:  bool 
 
       /// A flag read eagerly from the provided type and used to compute basic properties of the type definition.
       IsStructOrEnum: bool 
@@ -2009,6 +2012,7 @@ and Construct =
               IsStructOrEnum = st.PUntaint((fun st -> st.IsValueType || st.IsEnum), m)
               IsInterface = st.PUntaint((fun st -> st.IsInterface), m)
               IsSealed = st.PUntaint((fun st -> st.IsSealed), m)
+              IsAbstract = st.PUntaint((fun st -> st.IsAbstract), m)
               IsClass = st.PUntaint((fun st -> st.IsClass), m)
               IsErased = isErased
               IsSuppressRelocate = isSuppressRelocate }
diff --git a/tests/EndToEndBuildTests/ProvidedTypes/ProvidedTypes.fs b/tests/EndToEndBuildTests/ProvidedTypes/ProvidedTypes.fs
@@ -4026,7 +4026,7 @@ namespace ProviderImplementation.ProvidedTypes.AssemblyReader
             // Emit compressed untagged integer
             member buf.EmitZUntaggedIndex big idx = 
                 if big then buf.EmitInt32 idx
-                elif idx > 0xffff then failwith "EmitZUntaggedIndex: too big for small address or simple index"
+                elif idx > 0xffff then failwithf "EmitZUntaggedIndex: too big for small address or simple index, idx = %d, big = %A, stack = %s" idx big ((new System.Diagnostics.StackTrace()).ToString()) 
                 else buf.EmitInt32AsUInt16 idx
 
             // Emit compressed tagged integer
diff --git a/tests/fsharp/core/longnames/test.fsx b/tests/fsharp/core/longnames/test.fsx
@@ -688,6 +688,66 @@ module rec Ok23 =
 
     test "lkneecec09iew23" (typeof<A.Dummy>.FullName.Contains("AModule") )
 
+
+[<AbstractClass; Sealed>]
+type MyMath() =
+    static member Min(a: double, b: double) = System.Math.Min(a, b)
+    static member Min(a: int, b: int) = System.Math.Min(a, b)
+
+[<AbstractClass; Sealed; AutoOpen>]
+type AutoOpenMyMath() =
+    static member AutoMin(a: double, b: double) = System.Math.Min(a, b)
+    static member AutoMin(a: int, b: int) = System.Math.Min(a, b)
+
+[<AbstractClass; Sealed; RequireQualifiedAccess>]
+type NotAllowedToOpen() =
+    static member QualifiedMin(a: double, b: double) = System.Math.Min(a, b)
+    static member QualifiedMin(a: int, b: int) = System.Math.Min(a, b)
+
+module OpenSystemMathOnce = 
+
+    open System.Math
+    let x = Min(1.0, 2.0)
+    test "vwejhweoiu" (x = 1.0)
+
+
+module OpenSystemMathTwice = 
+
+    open System.Math
+    let x = Min(1.0, 2.0)
+
+    open System.Math
+    let x2 = Min(2.0, 1.0)
+
+    test "vwejhweoiu2" (x2 = 1.0)
+
+module OpenMyMathOnce = 
+
+    open MyMath
+    let x = Min(1.0, 2.0)
+    let x2 = Min(1, 2)
+
+    test "vwejhweoiu2" (x = 1.0)
+    test "vwejhweoiu3" (x2 = 1)
+
+module DontOpenAutoMath = 
+
+    let x = AutoMin(1.0, 2.0)
+    let x2 = AutoMin(1, 2)
+
+    test "vwejhweoiu2" (x = 1.0)
+    test "vwejhweoiu3" (x2 = 1)
+
+module OpenAutoMath = 
+    open AutoOpenMyMath
+    //open NotAllowedToOpen
+
+    let x = AutoMin(1.0, 2.0)
+    let x2 = AutoMin(1, 2)
+
+    test "vwejhweoiu2" (x = 1.0)
+    test "vwejhweoiu3" (x2 = 1)
+
 #if TESTS_AS_APP
 let RUN() = !failures
 #else
diff --git a/tests/service/EditorTests.fs b/tests/service/EditorTests.fs
@@ -1288,16 +1288,6 @@ let ``Test TPProject param info`` () =
 
 #endif // TEST_TP_PROJECTS
 
-#if EXE
-
-``Intro test`` () 
-//``Test TPProject all symbols`` () 
-//``Test TPProject errors`` () 
-//``Test TPProject quick info`` () 
-//``Test TPProject param info`` () 
-``Basic cancellation test`` ()
-``Intro test`` () 
-#endif
 
 [<Test>]
 let ``FSharpField.IsNameGenerated`` () =
diff --git a/vsintegration/tests/UnitTests/CompletionProviderTests.fs b/vsintegration/tests/UnitTests/CompletionProviderTests.fs
@@ -444,6 +444,14 @@ List().
                     "ExtensionMeth"]
     VerifyCompletionListExactly(fileContents, "List().", expected)
 
+[<Test>]
+let ``Completion for open contains namespaces and static types``() =
+    let fileContents = """
+open System.Ma
+"""
+    let expected = ["Management"; "Math"] // both namespace and static type
+    VerifyCompletionList(fileContents, "System.Ma", expected, [])
+
 [<Test>]
 let ``No completion on type name at declaration site``() =
     let fileContents = """
diff --git a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.Completion.fs b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.Completion.fs
@@ -3639,8 +3639,8 @@ let x = query { for bbbb in abbbbc(*D0*) do
         AssertAutoCompleteContains 
             [ "open System." ]
             "." // marker
-            [ "Collections" ] // should contain (namespace)
-            [ "Console" ] // should not contain (type)
+            [ "Collections"; "Console" ] // should contain (namespace, static type)
+            [ "Int32" ] // should not contain (non-static type)
 
     [<Test>]
     member public this.``OpenNamespaceOrModule.CompletionOnlyContainsNamespaceOrModule.Case2``() =        

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`}`
`11`	`11`	`},`
`12`	`12`	`"msbuild-sdks": {`
`13`		`- "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19353.19",`
	`13`	`+ "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19356.1",`
`14`	`14`	`"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2"`
`15`	`15`	`}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2295,3 +2295,4 @@ val isThreadOrContextStatic: TcGlobals -> Attrib list -> bool`
`2295`	`2295`
`2296`	`2296`	`val mkUnitDelayLambda: TcGlobals -> range -> Expr -> Expr`
`2297`	`2297`
	`2298`	`+val isStaticClass: g: TcGlobals -> tcref: TyconRef -> bool`