From 5625722beccdde63e5f246961b87a26d5add76df Mon Sep 17 00:00:00 2001 From: Ravi Chande Date: Thu, 1 Feb 2018 11:09:19 -0800 Subject: [PATCH 1/5] Update to omnisharp 1.29 --- package.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index e72c8d1f60..542cd77800 100644 --- a/package.json +++ b/package.json @@ -84,8 +84,8 @@ "runtimeDependencies": [ { "description": "OmniSharp for Windows (.NET 4.6 / x86)", - "url": "https://download.visualstudio.microsoft.com/download/pr/100505823/5804b7d3b5eeb7e4ae812a7cff03bd52/omnisharp-win-x86-1.28.0.zip", - "fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x86-1.28.0.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/100505823/5804b7d3b5eeb7e4ae812a7cff03bd52/omnisharp-win-x86-1.29.0.zip", + "fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x86-1.29.0.zip", "installPath": ".omnisharp", "platforms": [ "win32" @@ -97,8 +97,8 @@ }, { "description": "OmniSharp for Windows (.NET 4.6 / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/100505821/c570a9e20dbf7172f79850babd058872/omnisharp-win-x64-1.28.0.zip", - "fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x64-1.28.0.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/11539709/dcb3a815e48ea792fc788fc9fa6ea379/omnisharp-win-x86-1.29.0.zip", + "fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x64-1.29.0.zip", "installPath": ".omnisharp", "platforms": [ "win32" @@ -110,8 +110,8 @@ }, { "description": "OmniSharp for OSX", - "url": "https://download.visualstudio.microsoft.com/download/pr/100505818/6b99c6a86da3221919158ca0f36a3e45/omnisharp-osx-1.28.0.zip", - "fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-osx-1.28.0.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/11539710/5594f85f23035c42f0893f61a19f2340/omnisharp-osx-1.29.0.zip", + "fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-osx-1.29.0.zip", "installPath": ".omnisharp", "platforms": [ "darwin" @@ -124,8 +124,8 @@ }, { "description": "OmniSharp for Linux (x86)", - "url": "https://download.visualstudio.microsoft.com/download/pr/100505817/b710ec9c2bedc0cfdb57da82da166c47/omnisharp-linux-x86-1.28.0.zip", - "fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-linux-x86-1.28.0.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/11539707/ffe833a2a771adead00c977fe9b0a8ea/omnisharp-linux-x86-1.29.0.zip", + "fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-linux-x86-1.29.0.zip", "installPath": ".omnisharp", "platforms": [ "linux" @@ -142,8 +142,8 @@ }, { "description": "OmniSharp for Linux (x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/100505485/3f8a10409240decebb8a3189429f3fdf/omnisharp-linux-x64-1.28.0.zip", - "fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-linux-x64-1.28.0.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/11539705/289061d8686d4689d66fd1610b6891e2/omnisharp-linux-x64-1.29.0.zip", + "fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-linux-x64-1.29.0.zip", "installPath": ".omnisharp", "platforms": [ "linux" From 29c29902660f164cdcfe7c3b4a82136214defa73 Mon Sep 17 00:00:00 2001 From: Ravi Chande Date: Thu, 1 Feb 2018 11:39:29 -0800 Subject: [PATCH 2/5] Fix links --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 542cd77800..36def4d5b0 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "runtimeDependencies": [ { "description": "OmniSharp for Windows (.NET 4.6 / x86)", - "url": "https://download.visualstudio.microsoft.com/download/pr/100505823/5804b7d3b5eeb7e4ae812a7cff03bd52/omnisharp-win-x86-1.29.0.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/11539709/dcb3a815e48ea792fc788fc9fa6ea379/omnisharp-win-x86-1.29.0.zip", "fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x86-1.29.0.zip", "installPath": ".omnisharp", "platforms": [ @@ -97,7 +97,7 @@ }, { "description": "OmniSharp for Windows (.NET 4.6 / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/11539709/dcb3a815e48ea792fc788fc9fa6ea379/omnisharp-win-x86-1.29.0.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/11539712/2ceb65cab39ffc725480ede21ad8071c/omnisharp-win-x64-1.29.0.zip", "fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x64-1.29.0.zip", "installPath": ".omnisharp", "platforms": [ From 2af617b3e7a20bf3e691ff068bf9f1c22a7d6cd2 Mon Sep 17 00:00:00 2001 From: Akshita Agarwal Date: Thu, 1 Feb 2018 13:53:01 -0800 Subject: [PATCH 3/5] Make hover test pass --- test/integrationTests/hoverProvider.integration.test.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/test/integrationTests/hoverProvider.integration.test.ts b/test/integrationTests/hoverProvider.integration.test.ts index abd66d2ff9..1b945f8e5f 100644 --- a/test/integrationTests/hoverProvider.integration.test.ts +++ b/test/integrationTests/hoverProvider.integration.test.ts @@ -72,12 +72,11 @@ Parameters: \t\tgameObject: The game object. \t\ttagName: Name of the tag. -Returns trueif object is tagged with tag.`; +Returns true if object is tagged with tag.`; expect(c[0].contents[0].value).to.equal(answer); }); - teardown(async() => - { - await testAssetWorkspace.cleanupWorkspace(); - }) + teardown(async () => { + await testAssetWorkspace.cleanupWorkspace(); + }); }); \ No newline at end of file From 1065ccd8cb332a519c9fd7ac7581da4174a3050e Mon Sep 17 00:00:00 2001 From: Akshita Agarwal Date: Thu, 1 Feb 2018 13:53:01 -0800 Subject: [PATCH 4/5] Make hover test pass --- .../codeActionRename.integration.test.ts | 9 ++++++--- test/integrationTests/hoverProvider.integration.test.ts | 9 ++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/test/integrationTests/codeActionRename.integration.test.ts b/test/integrationTests/codeActionRename.integration.test.ts index 4afa0ff1f4..b2be1f4d59 100644 --- a/test/integrationTests/codeActionRename.integration.test.ts +++ b/test/integrationTests/codeActionRename.integration.test.ts @@ -30,9 +30,12 @@ suite(`Code Action Rename ${testAssetWorkspace.description}`, function() { test("Code actions can remame and open files", async () => { let fileUri = await testAssetWorkspace.projects[0].addFileWithContents("test.cs", "class C {}"); await vscode.commands.executeCommand("vscode.open", fileUri); - let c = await vscode.commands.executeCommand("vscode.executeCodeActionProvider", fileUri, new vscode.Range(0, 7, 0, 7)) as {command: string, arguments: string[]}[]; - expect(c.length).to.equal(2); - await vscode.commands.executeCommand(c[1].command, ...c[1].arguments) + let c = await vscode.commands.executeCommand("vscode.executeCodeActionProvider", fileUri, new vscode.Range(0, 7, 0, 7)) as {command: string, title: string, arguments: string[]}[]; + let command = c.find( + (s) => { return s.title == "Rename file to C.cs" } + ) + expect(command, "Didn't find rename class command"); + await vscode.commands.executeCommand(command.command, ...command.arguments) expect(vscode.window.activeTextEditor.document.fileName).contains("C.cs"); }); }); \ No newline at end of file diff --git a/test/integrationTests/hoverProvider.integration.test.ts b/test/integrationTests/hoverProvider.integration.test.ts index abd66d2ff9..1b945f8e5f 100644 --- a/test/integrationTests/hoverProvider.integration.test.ts +++ b/test/integrationTests/hoverProvider.integration.test.ts @@ -72,12 +72,11 @@ Parameters: \t\tgameObject: The game object. \t\ttagName: Name of the tag. -Returns trueif object is tagged with tag.`; +Returns true if object is tagged with tag.`; expect(c[0].contents[0].value).to.equal(answer); }); - teardown(async() => - { - await testAssetWorkspace.cleanupWorkspace(); - }) + teardown(async () => { + await testAssetWorkspace.cleanupWorkspace(); + }); }); \ No newline at end of file From d8189f0dbc1e8c7bb6ff65871b67fa8714d508de Mon Sep 17 00:00:00 2001 From: Ravi Chande Date: Fri, 2 Feb 2018 09:36:09 -0800 Subject: [PATCH 5/5] Make test pass --- test/integrationTests/hoverProvider.integration.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integrationTests/hoverProvider.integration.test.ts b/test/integrationTests/hoverProvider.integration.test.ts index c026de5f2d..04fdcf3d23 100644 --- a/test/integrationTests/hoverProvider.integration.test.ts +++ b/test/integrationTests/hoverProvider.integration.test.ts @@ -72,7 +72,7 @@ Parameters: \t\tgameObject: The game object. \t\ttagName: Name of the tag. -Returns true if object is tagged with tag.`; +Returns true if object is tagged with tag.`; expect(c[0].contents[0].value).to.equal(answer); });