bunch of random crap to revert later

psfinaki · psfinaki · commit 68cfc481e167 · 2022-11-04T15:30:52.000+01:00
diff --git a/NuGet.config b/NuGet.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+﻿<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <solution>
     <add key="disableSourceControlIntegration" value="true" />
@@ -15,6 +15,7 @@
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
     <add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
     <add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
+    <add key="another one" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/7.0.100-rtm.22518.5-shipping/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />
diff --git a/vsintegration/src/FSharp.LanguageService.Base/Source.cs b/vsintegration/src/FSharp.LanguageService.Base/Source.cs
@@ -1243,7 +1243,7 @@ private void HandleMethodTipResponse(BackgroundRequest_DEPRECATED req)
                     Microsoft.FSharp.Core.FSharpOption<MethodListForAMethodTip_DEPRECATED> methodsOpt = req.ResultIntellisenseInfo.GetMethodListForAMethodTip();
 					if (methodsOpt != null)
 					{
-						MethodListForAMethodTip_DEPRECATED methods = methodsOpt.Value;
+						MethodListForAMethodTip_DEPRECATED methods =  null;
 
 						if (methods != null)
 						{
diff --git a/vsintegration/src/FSharp.LanguageService.Base/ViewFilter.cs b/vsintegration/src/FSharp.LanguageService.Base/ViewFilter.cs
@@ -418,10 +418,7 @@ protected virtual int QueryCommandStatus(ref Guid guidCmdGroup, uint nCmdId)
                 {
                     var dbgState = Interactive.Hooks.GetDebuggerState(GetProjectSystemPackage());
 
-                    if (dbgState == Interactive.FsiDebuggerState.AttachedNotToFSI)
-                        return (int)OLECMDF.OLECMDF_INVISIBLE;
-                    else
-                        return (int)OLECMDF.OLECMDF_SUPPORTED | (int)OLECMDF.OLECMDF_ENABLED;
+                    return (int)OLECMDF.OLECMDF_SUPPORTED | (int)OLECMDF.OLECMDF_ENABLED;
                 }
             }
 
@@ -543,20 +540,17 @@ public virtual bool HandlePreExec(ref Guid guidCmdGroup, uint nCmdId, uint nCmde
             {
                 if (nCmdId == (uint) Microsoft.VisualStudio.VSConstants.VSStd11CmdID.ExecuteSelectionInInteractive)
                 {
-                    Interactive.Hooks.OnMLSend(GetProjectSystemPackage(), Interactive.FsiEditorSendAction.ExecuteSelection, null, null);
                     return true;
                 }
                 else if (nCmdId == (uint) Microsoft.VisualStudio.VSConstants.VSStd11CmdID.ExecuteLineInInteractive)
                 {
-                    Interactive.Hooks.OnMLSend(GetProjectSystemPackage(), Interactive.FsiEditorSendAction.ExecuteLine, null, null);
                     return true;
                 }
             }
             else if (guidCmdGroup == guidInteractive)
             {
                 if (nCmdId == cmdIDDebugSelection)
                 {
-                    Interactive.Hooks.OnMLSend(GetProjectSystemPackage(), Interactive.FsiEditorSendAction.DebugSelection, null, null);
                     return true;
                 }
             }
diff --git a/vsintegration/tests/MockTypeProviders/DefinitionLocationAttribute/TypeProviderInCSharp.cs b/vsintegration/tests/MockTypeProviders/DefinitionLocationAttribute/TypeProviderInCSharp.cs
@@ -45,11 +45,6 @@ public Type[] GetTypes()
             return new Type[] { myType };
         }
 
-        public string NamespaceName
-        {
-            get { return _Namespace; }
-        }
-
         public Type ResolveTypeName(string typeName)
         {
 
@@ -59,6 +54,11 @@ public Type ResolveTypeName(string typeName)
             }
             return null;
         }
+
+        string IProvidedNamespace.get_NamespaceName()
+        {
+            throw new NotImplementedException();
+        }
     }
 
     [TypeProvider()]
diff --git a/vsintegration/tests/MockTypeProviders/DefinitionLocationAttributeFileDoesnotExist/TypeProviderInCSharp.cs b/vsintegration/tests/MockTypeProviders/DefinitionLocationAttributeFileDoesnotExist/TypeProviderInCSharp.cs
@@ -45,11 +45,6 @@ public Type[] GetTypes()
             return new Type[] { myType };
         }
 
-        public string NamespaceName
-        {
-            get { return _Namespace; }
-        }
-
         public Type ResolveTypeName(string typeName)
         {
 
@@ -59,6 +54,11 @@ public Type ResolveTypeName(string typeName)
             }
             return null;
         }
+
+        string IProvidedNamespace.get_NamespaceName()
+        {
+            throw new NotImplementedException();
+        }
     }
 
     [TypeProvider()]
diff --git a/vsintegration/tests/MockTypeProviders/DefinitionLocationAttributeLineDoesnotExist/TypeProviderInCSharp.cs b/vsintegration/tests/MockTypeProviders/DefinitionLocationAttributeLineDoesnotExist/TypeProviderInCSharp.cs
@@ -45,11 +45,6 @@ public Type[] GetTypes()
             return new Type[] { myType };
         }
 
-        public string NamespaceName
-        {
-            get { return _Namespace; }
-        }
-
         public Type ResolveTypeName(string typeName)
         {
 
@@ -59,6 +54,11 @@ public Type ResolveTypeName(string typeName)
             }
             return null;
         }
+
+        string IProvidedNamespace.get_NamespaceName()
+        {
+            throw new NotImplementedException();
+        }
     }
 
     [TypeProvider()]
diff --git a/vsintegration/tests/MockTypeProviders/DefinitionLocationAttributeWithSpaceInTheType/TypeProviderInCSharp.cs b/vsintegration/tests/MockTypeProviders/DefinitionLocationAttributeWithSpaceInTheType/TypeProviderInCSharp.cs
@@ -45,11 +45,6 @@ public Type[] GetTypes()
             return new Type[] { myType };
         }
 
-        public string NamespaceName
-        {
-            get { return _Namespace; }
-        }
-
         public Type ResolveTypeName(string typeName)
         {
             
@@ -59,6 +54,11 @@ public Type ResolveTypeName(string typeName)
             }
             return null;
         }
+
+        string IProvidedNamespace.get_NamespaceName()
+        {
+            throw new NotImplementedException();
+        }
     }
 
     [TypeProvider()]
diff --git a/vsintegration/tests/MockTypeProviders/EditorHideMethodsAttribute/TypeProviderInCSharp.cs b/vsintegration/tests/MockTypeProviders/EditorHideMethodsAttribute/TypeProviderInCSharp.cs
@@ -45,11 +45,6 @@ public Type[] GetTypes()
             return new Type[] { myType };
         }
 
-        public string NamespaceName
-        {
-            get { return _Namespace; }
-        }
-
         public Type ResolveTypeName(string typeName)
         {
 
@@ -59,6 +54,11 @@ public Type ResolveTypeName(string typeName)
             }
             return null;
         }
+
+        string IProvidedNamespace.get_NamespaceName()
+        {
+            throw new NotImplementedException();
+        }
     }
 
     [TypeProvider()]
diff --git a/vsintegration/tests/MockTypeProviders/XmlDocAttributeWithAdequateComment/TypeProviderInCSharp.cs b/vsintegration/tests/MockTypeProviders/XmlDocAttributeWithAdequateComment/TypeProviderInCSharp.cs
@@ -44,12 +44,6 @@ public Type[] GetTypes()
 
             return new Type[] { myType };
         }
-
-        public string NamespaceName
-        {
-            get { return _Namespace; }
-        }
-
         public Type ResolveTypeName(string typeName)
         {
 
@@ -59,6 +53,11 @@ public Type ResolveTypeName(string typeName)
             }
             return null;
         }
+
+        string IProvidedNamespace.get_NamespaceName()
+        {
+            throw new NotImplementedException();
+        }
     }
 
     [TypeProvider()]
diff --git a/vsintegration/tests/MockTypeProviders/XmlDocAttributeWithEmptyComment/TypeProviderInCSharp.cs b/vsintegration/tests/MockTypeProviders/XmlDocAttributeWithEmptyComment/TypeProviderInCSharp.cs
@@ -45,11 +45,6 @@ public Type[] GetTypes()
             return new Type[] { myType };
         }
 
-        public string NamespaceName
-        {
-            get { return _Namespace; }
-        }
-
         public Type ResolveTypeName(string typeName)
         {
 
@@ -59,6 +54,11 @@ public Type ResolveTypeName(string typeName)
             }
             return null;
         }
+
+        string IProvidedNamespace.get_NamespaceName()
+        {
+            throw new NotImplementedException();
+        }
     }
 
     [TypeProvider()]
diff --git a/vsintegration/tests/MockTypeProviders/XmlDocAttributeWithLocalizedComment/TypeProviderInCSharp.cs b/vsintegration/tests/MockTypeProviders/XmlDocAttributeWithLocalizedComment/TypeProviderInCSharp.cs
@@ -45,11 +45,6 @@ public Type[] GetTypes()
             return new Type[] { myType };
         }
 
-        public string NamespaceName
-        {
-            get { return _Namespace; }
-        }
-
         public Type ResolveTypeName(string typeName)
         {
 
@@ -59,6 +54,11 @@ public Type ResolveTypeName(string typeName)
             }
             return null;
         }
+
+        string IProvidedNamespace.get_NamespaceName()
+        {
+            throw new NotImplementedException();
+        }
     }
 
     [TypeProvider()]
diff --git a/vsintegration/tests/MockTypeProviders/XmlDocAttributeWithLongComment/TypeProviderInCSharp.cs b/vsintegration/tests/MockTypeProviders/XmlDocAttributeWithLongComment/TypeProviderInCSharp.cs
@@ -45,11 +45,6 @@ public Type[] GetTypes()
             return new Type[] { myType };
         }
 
-        public string NamespaceName
-        {
-            get { return _Namespace; }
-        }
-
         public Type ResolveTypeName(string typeName)
         {
 
@@ -59,6 +54,11 @@ public Type ResolveTypeName(string typeName)
             }
             return null;
         }
+
+        string IProvidedNamespace.get_NamespaceName()
+        {
+            throw new NotImplementedException();
+        }
     }
 
     [TypeProvider()]
diff --git a/vsintegration/tests/MockTypeProviders/XmlDocAttributeWithNullComment/TypeProviderInCSharp.cs b/vsintegration/tests/MockTypeProviders/XmlDocAttributeWithNullComment/TypeProviderInCSharp.cs
@@ -45,11 +45,6 @@ public Type[] GetTypes()
             return new Type[] { myType };
         }
 
-        public string NamespaceName
-        {
-            get { return _Namespace; }
-        }
-
         public Type ResolveTypeName(string typeName)
         {
 
@@ -59,6 +54,11 @@ public Type ResolveTypeName(string typeName)
             }
             return null;
         }
+
+        string IProvidedNamespace.get_NamespaceName()
+        {
+            throw new NotImplementedException();
+        }
     }
 
     [TypeProvider()]
diff --git a/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj b/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj
@@ -148,18 +148,6 @@
   <!-- assemblies used during tests -->
   <ItemGroup>
     <ProjectReference Include="$(FSharpSourcesRoot)\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj" Private="true" />
-    <ProjectReference Include="..\MockTypeProviders\DefinitionLocationAttribute\DefinitionLocationAttribute.csproj" Private="true" />
-    <ProjectReference Include="..\MockTypeProviders\DefinitionLocationAttributeFileDoesnotExist\DefinitionLocationAttributeFileDoesnotExist.csproj" Private="true" />
-    <ProjectReference Include="..\MockTypeProviders\DefinitionLocationAttributeLineDoesnotExist\DefinitionLocationAttributeLineDoesnotExist.csproj" Private="true" />
-    <ProjectReference Include="..\MockTypeProviders\DefinitionLocationAttributeWithSpaceInTheType\DefinitionLocationAttributeWithSpaceInTheType.csproj" Private="true" />
-    <ProjectReference Include="..\MockTypeProviders\DummyProviderForLanguageServiceTesting\DummyProviderForLanguageServiceTesting.fsproj" Private="true" />
-    <ProjectReference Include="..\MockTypeProviders\EditorHideMethodsAttribute\EditorHideMethodsAttribute.csproj" Private="true" />
-    <ProjectReference Include="..\MockTypeProviders\EmptyAssembly\EmptyAssembly.fsproj" Private="true" />
-    <ProjectReference Include="..\MockTypeProviders\XmlDocAttributeWithAdequateComment\XmlDocAttributeWithAdequateComment.csproj" Private="true" />
-    <ProjectReference Include="..\MockTypeProviders\XmlDocAttributeWithEmptyComment\XmlDocAttributeWithEmptyComment.csproj" Private="true" />
-    <ProjectReference Include="..\MockTypeProviders\XmlDocAttributeWithLocalizedComment\XmlDocAttributeWithLocalizedComment.csproj" Private="true" />
-    <ProjectReference Include="..\MockTypeProviders\XmlDocAttributeWithLongComment\XmlDocAttributeWithLongComment.csproj" Private="true" />
-    <ProjectReference Include="..\MockTypeProviders\XmlDocAttributeWithNullComment\XmlDocAttributeWithNullComment.csproj" Private="true" />
   </ItemGroup>
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -1243,7 +1243,7 @@ private void HandleMethodTipResponse(BackgroundRequest_DEPRECATED req)`
`1243`	`1243`	`Microsoft.FSharp.Core.FSharpOption<MethodListForAMethodTip_DEPRECATED> methodsOpt = req.ResultIntellisenseInfo.GetMethodListForAMethodTip();`
`1244`	`1244`	`if (methodsOpt != null)`
`1245`	`1245`	`{`
`1246`		`- MethodListForAMethodTip_DEPRECATED methods = methodsOpt.Value;`
	`1246`	`+ MethodListForAMethodTip_DEPRECATED methods = null;`
`1247`	`1247`
`1248`	`1248`	`if (methods != null)`
`1249`	`1249`	`{`
Original file line number	Diff line number	Diff line change
`@@ -418,10 +418,7 @@ protected virtual int QueryCommandStatus(ref Guid guidCmdGroup, uint nCmdId)`
`418`	`418`	`{`
`419`	`419`	`var dbgState = Interactive.Hooks.GetDebuggerState(GetProjectSystemPackage());`
`420`	`420`
`421`		`- if (dbgState == Interactive.FsiDebuggerState.AttachedNotToFSI)`
`422`		`- return (int)OLECMDF.OLECMDF_INVISIBLE;`
`423`		`- else`
`424`		`- return (int)OLECMDF.OLECMDF_SUPPORTED \| (int)OLECMDF.OLECMDF_ENABLED;`
	`421`	`+ return (int)OLECMDF.OLECMDF_SUPPORTED \| (int)OLECMDF.OLECMDF_ENABLED;`
`425`	`422`	`}`
`426`	`423`	`}`
`427`	`424`
`@@ -543,20 +540,17 @@ public virtual bool HandlePreExec(ref Guid guidCmdGroup, uint nCmdId, uint nCmde`
`543`	`540`	`{`
`544`	`541`	`if (nCmdId == (uint) Microsoft.VisualStudio.VSConstants.VSStd11CmdID.ExecuteSelectionInInteractive)`
`545`	`542`	`{`
`546`		`- Interactive.Hooks.OnMLSend(GetProjectSystemPackage(), Interactive.FsiEditorSendAction.ExecuteSelection, null, null);`
`547`	`543`	`return true;`
`548`	`544`	`}`
`549`	`545`	`else if (nCmdId == (uint) Microsoft.VisualStudio.VSConstants.VSStd11CmdID.ExecuteLineInInteractive)`
`550`	`546`	`{`
`551`		`- Interactive.Hooks.OnMLSend(GetProjectSystemPackage(), Interactive.FsiEditorSendAction.ExecuteLine, null, null);`
`552`	`547`	`return true;`
`553`	`548`	`}`
`554`	`549`	`}`
`555`	`550`	`else if (guidCmdGroup == guidInteractive)`
`556`	`551`	`{`
`557`	`552`	`if (nCmdId == cmdIDDebugSelection)`
`558`	`553`	`{`
`559`		`- Interactive.Hooks.OnMLSend(GetProjectSystemPackage(), Interactive.FsiEditorSendAction.DebugSelection, null, null);`
`560`	`554`	`return true;`
`561`	`555`	`}`
`562`	`556`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,11 +45,6 @@ public Type[] GetTypes()`
`45`	`45`	`return new Type[] { myType };`
`46`	`46`	`}`
`47`	`47`
`48`		`- public string NamespaceName`
`49`		`- {`
`50`		`- get { return _Namespace; }`
`51`		`- }`
`52`		`-`
`53`	`48`	`public Type ResolveTypeName(string typeName)`
`54`	`49`	`{`
`55`	`50`
`@@ -59,6 +54,11 @@ public Type ResolveTypeName(string typeName)`
`59`	`54`	`}`
`60`	`55`	`return null;`
`61`	`56`	`}`
	`57`	`+`
	`58`	`+ string IProvidedNamespace.get_NamespaceName()`
	`59`	`+ {`
	`60`	`+ throw new NotImplementedException();`
	`61`	`+ }`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`[TypeProvider()]`
Original file line number	Diff line number	Diff line change
`@@ -44,12 +44,6 @@ public Type[] GetTypes()`
`44`	`44`
`45`	`45`	`return new Type[] { myType };`
`46`	`46`	`}`
`47`		`-`
`48`		`- public string NamespaceName`
`49`		`- {`
`50`		`- get { return _Namespace; }`
`51`		`- }`
`52`		`-`
`53`	`47`	`public Type ResolveTypeName(string typeName)`
`54`	`48`	`{`
`55`	`49`
`@@ -59,6 +53,11 @@ public Type ResolveTypeName(string typeName)`
`59`	`53`	`}`
`60`	`54`	`return null;`
`61`	`55`	`}`
	`56`	`+`
	`57`	`+ string IProvidedNamespace.get_NamespaceName()`
	`58`	`+ {`
	`59`	`+ throw new NotImplementedException();`
	`60`	`+ }`
`62`	`61`	`}`
`63`	`62`
`64`	`63`	`[TypeProvider()]`