File tree Expand file tree Collapse file tree 1 file changed +6
-9
lines changed Expand file tree Collapse file tree 1 file changed +6
-9
lines changed Original file line number Diff line number Diff line change 55
66import * as vscode from "vscode" ;
77import CSharpImplementationProvider from "../../src/features/implementationProvider" ;
8- import CSharpExtensionExports from "../../src/CSharpExtensionExports" ;
98import * as path from "path" ;
109import testAssetWorkspace from "./testAssets/testAssetWorkspace" ;
1110import { expect } from "chai" ;
11+ import { activateCSharpExtension } from './integrationHelpers' ;
1212
1313suite ( `${ CSharpImplementationProvider . name } : ${ testAssetWorkspace . description } ` , ( ) => {
1414 let fileUri : vscode . Uri ;
15-
15+
1616 suiteSetup ( async ( ) => {
17- let csharpExtension = vscode . extensions . getExtension < CSharpExtensionExports > ( "ms-vscode.csharp" ) ;
18- if ( ! csharpExtension . isActive ) {
19- await csharpExtension . activate ( ) ;
20- }
17+ await testAssetWorkspace . restore ( ) ;
18+ await activateCSharpExtension ( ) ;
2119
22- await csharpExtension . exports . initializationFinished ( ) ;
2320 let fileName = 'implementation.cs' ;
24- let dir = path . dirname ( testAssetWorkspace . projects [ 0 ] . projectDirectoryPath ) ;
25- fileUri = vscode . Uri . file ( path . join ( dir , fileName ) ) ;
21+ let projectDirectory = testAssetWorkspace . projects [ 0 ] . projectDirectoryPath ;
22+ fileUri = vscode . Uri . file ( path . join ( projectDirectory , fileName ) ) ;
2623 await vscode . commands . executeCommand ( "vscode.open" , fileUri ) ;
2724 } ) ;
2825
You can’t perform that action at this time.
0 commit comments