Skip to content

Make hover test pass? #1987

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
merged 6 commits into from
Feb 2, 2018
Merged

Make hover test pass? #1987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
026486c
Make hover test pass?
Jan 30, 2018
7bc2df3
Remove extra blank lines
Jan 30, 2018
bba9eec
Merge branch 'master' into hoverTest
Feb 1, 2018
4e9052c
Check in dotnet restore'd files'
Feb 2, 2018
4a3530f
Check in more restore assets
Feb 2, 2018
c6d4ad3
Merge branch 'hoverTest' of https://github.com/rchande/omnisharp-vsco…
Feb 2, 2018
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
7 changes: 3 additions & 4 deletions src/omnisharp/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
8 changes: 4 additions & 4 deletions test/integrationTests/hoverProvider.integration.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
Empty file added ...grationTests/testAssets/singleCsproj/obj/Debug/netcoreapp2.0/singleCsproj.AssemblyInfo.cs
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions ...sts/testAssets/singleCsproj/obj/Debug/netcoreapp2.0/singleCsproj.AssemblyInfoInputs.cache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
430bdcfd8bad4c9c4b8cb192efe5e61394e77ebc
1 change: 1 addition & 0 deletions ...stAssets/singleCsproj/obj/Debug/netcoreapp2.0/singleCsproj.csproj.CoreCompileInputs.cache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fe2f654e9c48e6a308b6a264aa38a2b3defe5730
721 changes: 721 additions & 0 deletions test/integrationTests/testAssets/singleCsproj/obj/project.assets.json
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions test/integrationTests/testAssets/singleCsproj/obj/singleCsproj.csproj.nuget.cache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"version": 1,
"dgSpecHash": "F/2npLNJmV62pdE6xnL6onDE/ZUOXXwAbeOh12Em+cH/3uZOrmJZgsI0iJtb+26OOF3cRtdrW33x5W5+YX4DVw==",
"success": true
}
18 changes: 18 additions & 0 deletions test/integrationTests/testAssets/singleCsproj/obj/singleCsproj.csproj.nuget.g.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Copy link
Contributor

@akshita31 akshita31 Feb 2, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we check in these files ?

Copy link
Member

@DustinCampbell DustinCampbell Feb 5, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch -- @rchande: Note that these have absolute paths. Is that a concern?

<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>
10 changes: 10 additions & 0 deletions test/integrationTests/testAssets/singleCsproj/obj/singleCsproj.csproj.nuget.g.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
5 changes: 5 additions & 0 deletions test/integrationTests/testAssets/slnWithCsproj/src/app/obj/app.csproj.nuget.cache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"version": 1,
"dgSpecHash": "RNA104eAZOOjmBHjHUGqqHR8Fn7tcLprXcob3oYEPt6wIFL2EV8N4mAG22nU31T1NJV+oAzYBZ7kJEOWeYa4gA==",
"success": true
}
18 changes: 18 additions & 0 deletions test/integrationTests/testAssets/slnWithCsproj/src/app/obj/app.csproj.nuget.g.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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\slnWithCsproj\src\app\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>
10 changes: 10 additions & 0 deletions test/integrationTests/testAssets/slnWithCsproj/src/app/obj/app.csproj.nuget.g.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Loading