Merge pull request #1987 from rchande/hoverTest

Make hover test pass?

Author: Ravi Chande

src/omnisharp/server.ts

@@ -351,11 +351,10 @@ export class OmniSharpServer {
         });
     }
 
-    public restart(launchTarget: LaunchTarget = this._launchTarget): Promise<void> {
+    public async restart(launchTarget: LaunchTarget = this._launchTarget): Promise<void> {
         if (launchTarget) {
-            return this.stop().then(() => {
-                this._start(launchTarget);
-            });
+            await this.stop();
+            await this._start(launchTarget);
         }
     }
 

test/integrationTests/hoverProvider.integration.test.ts

@@ -21,22 +21,22 @@ suite(`Tasks generation: ${testAssetWorkspace.description}`, function() {
     suiteSetup(async function() { 
         should();
 
+        await testAssetWorkspace.cleanupWorkspace();
+
         let csharpExtension = vscode.extensions.getExtension("ms-vscode.csharp"); 
         if (!csharpExtension.isActive) { 
             await csharpExtension.activate(); 
         }
 
-        await testAssetWorkspace.cleanupWorkspace();
-
         await csharpExtension.exports.initializationFinished;
-        
+        await omnisharp.restart();
+
         await vscode.commands.executeCommand("dotnet.generateAssets");
 
         await poll(async () => await fs.exists(testAssetWorkspace.launchJsonPath), 10000, 100);
 
     }); 
 
-
    test("Hover returns structured documentation with proper newlines", async function ()  {                
 
        let program = 

test/integrationTests/testAssets/singleCsproj/obj/Debug/netcoreapp2.0/singleCsproj.AssemblyInfo.cs

@@ -0,0 +1 @@
+430bdcfd8bad4c9c4b8cb192efe5e61394e77ebc

test/integrationTests/testAssets/singleCsproj/obj/Debug/netcoreapp2.0/singleCsproj.AssemblyInfoInputs.cache

@@ -0,0 +1 @@
+fe2f654e9c48e6a308b6a264aa38a2b3defe5730

test/integrationTests/testAssets/singleCsproj/obj/Debug/netcoreapp2.0/singleCsproj.csproj.CoreCompileInputs.cache

@@ -0,0 +1,5 @@
+{
+  "version": 1,
+  "dgSpecHash": "F/2npLNJmV62pdE6xnL6onDE/ZUOXXwAbeOh12Em+cH/3uZOrmJZgsI0iJtb+26OOF3cRtdrW33x5W5+YX4DVw==",
+  "success": true
+}

test/integrationTests/testAssets/singleCsproj/obj/project.assets.json

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
+    <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
+    <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
+    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">C:\omnisharp-vscode\test\integrationTests\testAssets\singleCsproj\obj\project.assets.json</ProjectAssetsFile>
+    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\rchande\.nuget\packages\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder</NuGetPackageFolders>
+    <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">4.5.0</NuGetToolVersion>
+  </PropertyGroup>
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+  </PropertyGroup>
+  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
+    <Import Project="$(NuGetPackageRoot)microsoft.netcore.app\2.0.0\build\netcoreapp2.0\Microsoft.NETCore.App.props" Condition="Exists('$(NuGetPackageRoot)microsoft.netcore.app\2.0.0\build\netcoreapp2.0\Microsoft.NETCore.App.props')" />
+  </ImportGroup>
+</Project>

test/integrationTests/testAssets/singleCsproj/obj/singleCsproj.csproj.nuget.cache

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+  </PropertyGroup>
+  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
+    <Import Project="$(NuGetPackageRoot)netstandard.library\2.0.0\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('$(NuGetPackageRoot)netstandard.library\2.0.0\build\netstandard2.0\NETStandard.Library.targets')" />
+    <Import Project="$(NuGetPackageRoot)microsoft.netcore.app\2.0.0\build\netcoreapp2.0\Microsoft.NETCore.App.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.netcore.app\2.0.0\build\netcoreapp2.0\Microsoft.NETCore.App.targets')" />
+  </ImportGroup>
+</Project>

test/integrationTests/testAssets/singleCsproj/obj/singleCsproj.csproj.nuget.g.props

@@ -0,0 +1,5 @@
+{
+  "version": 1,
+  "dgSpecHash": "RNA104eAZOOjmBHjHUGqqHR8Fn7tcLprXcob3oYEPt6wIFL2EV8N4mAG22nU31T1NJV+oAzYBZ7kJEOWeYa4gA==",
+  "success": true
+}