Merge pull request #3592 from ryanbrandenburg/rybrande/VirtualFiles

Ignore virtual files
dotnet · Feb 25, 2020 · ce7433c · ce7433c
2 parents 1ebb473 + e78397c
commit ce7433c
Show file tree

Hide file tree

Showing 21 changed files with 210 additions and 26 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 bin
+obj
 node_modules
 out
 .omnisharp/

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -84,6 +84,25 @@
             ],
             "preLaunchTask": "buildDev"
         },
+        {
+            "name": "Launch razorcsproj Workspace Tests",
+            "type": "extensionHost",
+            "request": "launch",
+            "runtimeExecutable": "${execPath}",
+            "args": [
+                "--disable-extensions",
+                "${workspaceRoot}/test/integrationTests/testAssets/BasicRazorApp2_1",
+                "--extensionDevelopmentPath=${workspaceRoot}",
+                "--extensionTestsPath=${workspaceRoot}/out/test/integrationTests"
+            ],
+            "env": {
+                "CODE_WORKSPACE_ROOT": "${workspaceRoot}",
+                "CODE_TESTS_PATH": "${workspaceRoot}/out/test/integrationTests",
+                "CODE_TESTS_WORKSPACE": "${workspaceRoot}/test/integrationTests/testAssets/BasicRazorApp2_1",
+                "CODE_EXTENSIONS_PATH": "${workspaceRoot}",
+                "OSVC_SUITE": "BasicRazorApp2_1"
+            },
+        },
         {
             "name": "Launch slnWithCsproj Workspace Tests",
             "type": "extensionHost",

diff --git a/src/features/diagnosticsProvider.ts b/src/features/diagnosticsProvider.ts
@@ -251,6 +251,12 @@ class DiagnosticsProvider extends AbstractSupport {
                     return;
                 }
 
+                // No problems published for virtual files
+                if(isVirtualCSharpDocument(document))
+                {
+                    return;
+                }
+
                 // (re)set new diagnostics for this document
                 let diagnosticsInFile = this._mapQuickFixesAsDiagnosticsInFile(quickFixes);
 

diff --git a/tasks/testTasks.ts b/tasks/testTasks.ts
@@ -45,10 +45,15 @@ gulp.task("test:integration:slnWithCsproj", async () => {
     return runIntegrationTest("slnWithCsproj");
 });
 
+gulp.task("test:integration:BasicRazorApp2_1", async () => {
+    return runIntegrationTest("BasicRazorApp2_1");
+});
+
 gulp.task(
     "test:integration", gulp.series(
         "test:integration:singleCsproj",
-        "test:integration:slnWithCsproj"
+        "test:integration:slnWithCsproj",
+        "test:integration:BasicRazorApp2_1"
     ));
 
 gulp.task("test", gulp.series(

diff --git a/test/integrationTests/advisor.integration.test.ts b/test/integrationTests/advisor.integration.test.ts
@@ -7,7 +7,7 @@ import * as vscode from 'vscode';
 
 import { expect } from 'chai';
 import * as path from 'path';
-import { activateCSharpExtension } from './integrationHelpers';
+import { activateCSharpExtension, isRazorWorkspace } from './integrationHelpers';
 import testAssetWorkspace from './testAssets/testAssetWorkspace';
 
 import { Advisor } from '../../src/features/diagnosticsProvider';
@@ -25,6 +25,11 @@ suite(`Advisor ${testAssetWorkspace.description}`, function () {
     let advisor: Advisor;
 
     suiteSetup(async function () {
+        // These tests don't run on the BasicRazorApp2_1 solution
+        if (isRazorWorkspace(vscode.workspace)) {
+            this.skip();
+        }
+
         let activationResult = await activateCSharpExtension();
         await testAssetWorkspace.restore();
 

diff --git a/test/integrationTests/codeActionRename.integration.test.ts b/test/integrationTests/codeActionRename.integration.test.ts
@@ -6,7 +6,7 @@
 import * as vscode from 'vscode';
 
 import { should, expect } from 'chai';
-import { activateCSharpExtension } from './integrationHelpers';
+import { activateCSharpExtension, isRazorWorkspace } from './integrationHelpers';
 import testAssetWorkspace from './testAssets/testAssetWorkspace';
 import * as path from 'path';
 import { assertWithPoll } from './poll';
@@ -20,6 +20,12 @@ suite(`Code Action Rename ${testAssetWorkspace.description}`, function () {
 
     suiteSetup(async function () {
         should();
+
+        // These tests don't run on the BasicRazorApp2_1 solution
+        if (isRazorWorkspace(vscode.workspace)) {
+            this.skip();
+        }
+
         await activateCSharpExtension();
         await testAssetWorkspace.restore();
 

diff --git a/test/integrationTests/completionItemProvider.integration.test.ts b/test/integrationTests/completionItemProvider.integration.test.ts
@@ -8,12 +8,17 @@ import * as vscode from 'vscode';
 import testAssetWorkspace from "./testAssets/testAssetWorkspace";
 import * as path from "path";
 import { expect } from "chai";
-import { activateCSharpExtension } from "./integrationHelpers";
+import { activateCSharpExtension, isRazorWorkspace } from "./integrationHelpers";
 
 suite(`${OmniSharpCompletionItemProvider.name}: Returns the completion items`, () => {
     let fileUri: vscode.Uri;
 
-    suiteSetup(async () => {
+    suiteSetup(async function() {
+        // These tests don't run on the BasicRazorApp2_1 solution
+        if (isRazorWorkspace(vscode.workspace)) {
+            this.skip();
+        }
+
         await activateCSharpExtension();
         await testAssetWorkspace.restore();
 

diff --git a/test/integrationTests/definitionProvider.test.ts b/test/integrationTests/definitionProvider.test.ts
@@ -8,12 +8,17 @@ import CSharpDefinitionProvider from "../../src/features/definitionProvider";
 import * as path from "path";
 import testAssetWorkspace from "./testAssets/testAssetWorkspace";
 import { expect } from "chai";
-import { activateCSharpExtension } from './integrationHelpers';
+import { activateCSharpExtension, isRazorWorkspace } from './integrationHelpers';
 
 suite(`${CSharpDefinitionProvider.name}: ${testAssetWorkspace.description}`, () => {
     let fileUri: vscode.Uri;
 
-    suiteSetup(async () => {
+    suiteSetup(async function () {
+        // These tests don't run on the BasicRazorApp2_1 solution
+        if (isRazorWorkspace(vscode.workspace)) {
+            this.skip();
+        }
+
         await activateCSharpExtension();
         await testAssetWorkspace.restore();
 

diff --git a/test/integrationTests/diagnostics.integration.test.ts b/test/integrationTests/diagnostics.integration.test.ts
@@ -7,9 +7,9 @@ import * as vscode from 'vscode';
 import * as path from 'path';
 
 import { should, expect } from 'chai';
-import { activateCSharpExtension } from './integrationHelpers';
+import { activateCSharpExtension, isRazorWorkspace } from './integrationHelpers';
 import testAssetWorkspace from './testAssets/testAssetWorkspace';
-import { poll, assertWithPoll } from './poll';
+import { poll, assertWithPoll, pollDoesNotHappen } from './poll';
 
 const chai = require('chai');
 chai.use(require('chai-arrays'));
@@ -23,6 +23,8 @@ function setDiagnosticWorkspaceLimit(to: number | null) {
 suite(`DiagnosticProvider: ${testAssetWorkspace.description}`, function () {
     let fileUri: vscode.Uri;
     let secondaryFileUri: vscode.Uri;
+    let razorFileUri: vscode.Uri;
+    let virtualRazorFileUri: vscode.Uri;
 
     suiteSetup(async function () {
         should();
@@ -36,11 +38,56 @@ suite(`DiagnosticProvider: ${testAssetWorkspace.description}`, function () {
 
         fileUri = vscode.Uri.file(path.join(projectDirectory, fileName));
         secondaryFileUri = vscode.Uri.file(path.join(projectDirectory, secondaryFileName));
+        razorFileUri = vscode.Uri.file(path.join(projectDirectory, 'Pages', 'ErrorHaver.razor'));
+        virtualRazorFileUri = vscode.Uri.file(razorFileUri.fsPath + '__virtual.cs');
+    });
+
+    suite("razor workspace", () => {
+        suiteSetup(async function () {
+            should();
+
+            // These tests only run on the BasicRazorApp2_1 solution
+            if (!isRazorWorkspace(vscode.workspace)) {
+                this.skip();
+            }
+
+            await activateCSharpExtension();
+            await testAssetWorkspace.restore();
+            await vscode.commands.executeCommand("vscode.open", razorFileUri);
+        });
+
+        test("Razor shouldn't give diagnostics for virtual files", async () => {
+            await pollDoesNotHappen(() => vscode.languages.getDiagnostics(), 5 * 1000, 500, function(res) {
+                const virtual = res.find(r => r[0].fsPath === virtualRazorFileUri.fsPath);
+
+                if(!virtual) {
+                    return false;
+                }
+
+                const diagnosticsList = virtual[1];
+                if(diagnosticsList.some(diag => diag.code == 'CS0103')) {
+                    return true;
+                }
+                else{
+                    return false;
+                }
+            });
+        });
+
+        suiteTeardown(async () => {
+            await testAssetWorkspace.cleanupWorkspace();
+        });
     });
 
     suite("small workspace (based on maxProjectFileCountForDiagnosticAnalysis setting)", () => {
         suiteSetup(async function () {
             should();
+
+            // These tests don't run on the BasicRazorApp2_1 solution
+            if (isRazorWorkspace(vscode.workspace)) {
+                this.skip();
+            }
+
             await activateCSharpExtension();
             await testAssetWorkspace.restore();
             await vscode.commands.executeCommand("vscode.open", fileUri);
@@ -78,6 +125,12 @@ suite(`DiagnosticProvider: ${testAssetWorkspace.description}`, function () {
     suite("large workspace (based on maxProjectFileCountForDiagnosticAnalysis setting)", () => {
         suiteSetup(async function () {
             should();
+
+            // These tests don't run on the BasicRazorApp2_1 solution
+            if (isRazorWorkspace(vscode.workspace)) {
+                this.skip();
+            }
+
             await setDiagnosticWorkspaceLimit(1);
             await testAssetWorkspace.restore();
             await activateCSharpExtension();

diff --git a/test/integrationTests/documentSymbolProvider.integration.test.ts b/test/integrationTests/documentSymbolProvider.integration.test.ts
@@ -7,7 +7,7 @@ import * as vscode from 'vscode';
 import * as path from 'path';
 
 import { should, expect } from 'chai';
-import { activateCSharpExtension } from './integrationHelpers';
+import { activateCSharpExtension, isRazorWorkspace } from './integrationHelpers';
 import testAssetWorkspace from './testAssets/testAssetWorkspace';
 
 const chai = require('chai');
@@ -19,6 +19,12 @@ suite(`DocumentSymbolProvider: ${testAssetWorkspace.description}`, function () {
 
     suiteSetup(async function () {
         should();
+
+        // These tests don't run on the BasicRazorApp2_1 solution
+        if (isRazorWorkspace(vscode.workspace)) {
+            this.skip();
+        }
+
         await activateCSharpExtension();
         await testAssetWorkspace.restore();
 

diff --git a/test/integrationTests/hoverProvider.integration.test.ts b/test/integrationTests/hoverProvider.integration.test.ts
@@ -7,7 +7,7 @@ import * as vscode from 'vscode';
 import * as path from 'path';
 
 import { should, expect } from 'chai';
-import { activateCSharpExtension } from './integrationHelpers';
+import { activateCSharpExtension, isRazorWorkspace } from './integrationHelpers';
 import testAssetWorkspace from './testAssets/testAssetWorkspace';
 
 const chai = require('chai');
@@ -17,6 +17,12 @@ chai.use(require('chai-fs'));
 suite(`Hover Provider: ${testAssetWorkspace.description}`, function () {
     suiteSetup(async function () {
         should();
+
+        // These tests don't run on the BasicRazorApp2_1 solution
+        if (isRazorWorkspace(vscode.workspace)) {
+            this.skip();
+        }
+
         await activateCSharpExtension();
         await testAssetWorkspace.restore();
     });

diff --git a/test/integrationTests/implementationProvider.test.ts b/test/integrationTests/implementationProvider.test.ts
@@ -8,12 +8,17 @@ import CSharpImplementationProvider from "../../src/features/implementationProvi
 import * as path from "path";
 import testAssetWorkspace from "./testAssets/testAssetWorkspace";
 import { expect } from "chai";
-import { activateCSharpExtension } from './integrationHelpers';
+import { activateCSharpExtension, isRazorWorkspace } from './integrationHelpers';
 
 suite(`${CSharpImplementationProvider.name}: ${testAssetWorkspace.description}`, () => {
     let fileUri: vscode.Uri;
 
-    suiteSetup(async () => {
+    suiteSetup(async function() {
+        // These tests don't run on the BasicRazorApp2_1 solution
+        if (isRazorWorkspace(vscode.workspace)) {
+            this.skip();
+        }
+
         await activateCSharpExtension();
         await testAssetWorkspace.restore();
 

diff --git a/test/integrationTests/integrationHelpers.ts b/test/integrationTests/integrationHelpers.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as path from 'path';
 import * as vscode from 'vscode';
 import CSharpExtensionExports from '../../src/CSharpExtensionExports';
 import { Advisor } from '../../src/features/diagnosticsProvider';
@@ -34,4 +35,9 @@ export async function activateCSharpExtension(): Promise<ActivationResult | unde
     }
 }
 
+export function isRazorWorkspace(workspace: typeof vscode.workspace) {
+    const primeWorkspace = workspace.workspaceFolders[0];
+    const projectFileName = primeWorkspace.uri.fsPath.split(path.sep).pop();
 
+    return projectFileName === 'BasicRazorApp2_1';
+}
diff --git a/test/integrationTests/languageMiddleware.integration.test.ts b/test/integrationTests/languageMiddleware.integration.test.ts
@@ -7,14 +7,19 @@ import * as vscode from "vscode";
 import * as path from "path";
 import testAssetWorkspace from "./testAssets/testAssetWorkspace";
 import { expect } from "chai";
-import { activateCSharpExtension } from './integrationHelpers';
+import { activateCSharpExtension, isRazorWorkspace } from './integrationHelpers';
 import { LanguageMiddleware, LanguageMiddlewareFeature } from "../../src/omnisharp/LanguageMiddlewareFeature";
 
 suite(`${LanguageMiddlewareFeature.name}: ${testAssetWorkspace.description}`, () => {
     let fileUri: vscode.Uri;
     let remappedFileUri: vscode.Uri;
 
-    suiteSetup(async () => {
+    suiteSetup(async function () {
+        // These tests don't run on the BasicRazorApp2_1 solution
+        if (isRazorWorkspace(vscode.workspace)) {
+            this.skip();
+        }
+
         await activateCSharpExtension();
         await registerLanguageMiddleware();
         await testAssetWorkspace.restore();
@@ -41,7 +46,7 @@ suite(`${LanguageMiddlewareFeature.name}: ${testAssetWorkspace.description}`, ()
             fileUri,
             new vscode.Position(4, 30),
             'newName'));
-        
+
         let entries = workspaceEdit!.entries();
         expect(entries.length).to.be.equal(1);
         expect(entries[0][0].path).to.be.equal(remappedFileUri.path);
@@ -93,7 +98,7 @@ class TestLanguageMiddleware implements LanguageMiddleware
         let fileToRemap = 'remap.cs';
         this.fileToRemapUri = vscode.Uri.file(path.join(projectDirectory, fileToRemap));
     }
-    
+
     remapWorkspaceEdit?(workspaceEdit: vscode.WorkspaceEdit, token: vscode.CancellationToken): vscode.ProviderResult<vscode.WorkspaceEdit> {
         const newEdit = new vscode.WorkspaceEdit();
         for (const entry of workspaceEdit.entries()) {

diff --git a/test/integrationTests/launchConfiguration.integration.test.ts b/test/integrationTests/launchConfiguration.integration.test.ts
@@ -7,7 +7,7 @@ import * as fs from 'async-file';
 import * as vscode from 'vscode';
 
 import { should, expect } from 'chai';
-import { activateCSharpExtension } from './integrationHelpers';
+import { activateCSharpExtension, isRazorWorkspace } from './integrationHelpers';
 import testAssetWorkspace from './testAssets/testAssetWorkspace';
 import { poll } from './poll';
 
@@ -18,6 +18,12 @@ chai.use(require('chai-fs'));
 suite(`Tasks generation: ${testAssetWorkspace.description}`, function () {
     suiteSetup(async function () {
         should();
+
+        // These tests don't run on the BasicRazorApp2_1 solution
+        if (isRazorWorkspace(vscode.workspace)) {
+            this.skip();
+        }
+
         await activateCSharpExtension();
         await testAssetWorkspace.restore();