Skip to content

Commit 3e8c17e

Browse files
authored
Merge pull request #7522 from dotnet/dev/jorobich/collocate-omnisharp-code
Move OmniSharp code under the src/omnisharp folder
2 parents 231c3d5 + 9dd8155 commit 3e8c17e

File tree

89 files changed

+421
-401
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+421
-401
lines changed

l10n/bundle.l10n.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,18 @@
143143
"Package {0} download from {1} failed integrity check. Some features may not work as expected. Please restart Visual Studio Code to retrigger the download": "Package {0} download from {1} failed integrity check. Some features may not work as expected. Please restart Visual Studio Code to retrigger the download",
144144
"Failed to run test: {0}": "Failed to run test: {0}",
145145
"Failed to start debugger: {0}": "Failed to start debugger: {0}",
146+
"pipeArgs must be a string or a string array type": "pipeArgs must be a string or a string array type",
147+
"Name not defined in current configuration.": "Name not defined in current configuration.",
148+
"Configuration \"{0}\" in launch.json does not have a {1} argument with {2} for remote process listing.": "Configuration \"{0}\" in launch.json does not have a {1} argument with {2} for remote process listing.",
149+
"Select the process to attach to": "Select the process to attach to",
150+
"Pipe transport failed to get OS and processes.": "Pipe transport failed to get OS and processes.",
151+
"Operating system \"{0}\" not supported.": "Operating system \"{0}\" not supported.",
152+
"Transport attach could not obtain processes list.": "Transport attach could not obtain processes list.",
153+
"Error Message: ": "Error Message: ",
154+
"See {0} output": "See {0} output",
155+
"Text editor must be focused to fix all issues": "Text editor must be focused to fix all issues",
156+
"Fix all issues": "Fix all issues",
157+
"Select fix all action": "Select fix all action",
146158
"Test run already in progress": "Test run already in progress",
147159
"Server stopped": "Server stopped",
148160
"Workspace projects": "Workspace projects",
@@ -167,18 +179,6 @@
167179
"Active File Context": "Active File Context",
168180
"Pick a fix all scope": "Pick a fix all scope",
169181
"Fix All Code Action": "Fix All Code Action",
170-
"pipeArgs must be a string or a string array type": "pipeArgs must be a string or a string array type",
171-
"Name not defined in current configuration.": "Name not defined in current configuration.",
172-
"Configuration \"{0}\" in launch.json does not have a {1} argument with {2} for remote process listing.": "Configuration \"{0}\" in launch.json does not have a {1} argument with {2} for remote process listing.",
173-
"Select the process to attach to": "Select the process to attach to",
174-
"Pipe transport failed to get OS and processes.": "Pipe transport failed to get OS and processes.",
175-
"Operating system \"{0}\" not supported.": "Operating system \"{0}\" not supported.",
176-
"Transport attach could not obtain processes list.": "Transport attach could not obtain processes list.",
177-
"Error Message: ": "Error Message: ",
178-
"See {0} output": "See {0} output",
179-
"Text editor must be focused to fix all issues": "Text editor must be focused to fix all issues",
180-
"Fix all issues": "Fix all issues",
181-
"Select fix all action": "Select fix all action",
182182
"Failed to set extension directory": "Failed to set extension directory",
183183
"Failed to set debugadpter directory": "Failed to set debugadpter directory",
184184
"Failed to set install complete file path": "Failed to set install complete file path",

omnisharptest/omnisharpIntegrationTests/advisor.integration.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import * as vscode from 'vscode';
99
import { activateCSharpExtension, describeIfNotRazorOrGenerator } from './integrationHelpers';
1010
import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
1111

12-
import { Advisor } from '../../src/features/diagnosticsProvider';
12+
import { Advisor } from '../../src/omnisharp/features/diagnosticsProvider';
1313

1414
function setLimit(to: number | null) {
1515
const csharpConfig = vscode.workspace.getConfiguration('csharp');

omnisharptest/omnisharpIntegrationTests/completionProvider.integration.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import { expect, test, beforeAll, afterAll } from '@jest/globals';
7-
import OmniSharpCompletionProvider from '../../src/features/completionProvider';
7+
import OmniSharpCompletionProvider from '../../src/omnisharp/features/completionProvider';
88
import * as vscode from 'vscode';
99
import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
1010
import * as path from 'path';

omnisharptest/omnisharpIntegrationTests/definitionProvider.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import { expect, test, beforeAll, afterAll } from '@jest/globals';
77
import * as vscode from 'vscode';
8-
import OmniSharpDefinitionProvider from '../../src/features/definitionProvider';
8+
import OmniSharpDefinitionProvider from '../../src/omnisharp/features/definitionProvider';
99
import * as path from 'path';
1010
import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
1111
import { activateCSharpExtension, describeIfNotRazorOrGenerator, restartOmniSharpServer } from './integrationHelpers';

omnisharptest/omnisharpIntegrationTests/implementationProvider.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import { expect, test, beforeAll, afterAll } from '@jest/globals';
77
import * as vscode from 'vscode';
8-
import OmniSharpImplementationProvider from '../../src/features/implementationProvider';
8+
import OmniSharpImplementationProvider from '../../src/omnisharp/features/implementationProvider';
99
import * as path from 'path';
1010
import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
1111
import { activateCSharpExtension, describeIfNotRazorOrGenerator } from './integrationHelpers';

omnisharptest/omnisharpIntegrationTests/integrationHelpers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import * as path from 'path';
77
import * as vscode from 'vscode';
8-
import { Advisor } from '../../src/features/diagnosticsProvider';
8+
import { Advisor } from '../../src/omnisharp/features/diagnosticsProvider';
99
import { EventStream } from '../../src/eventStream';
1010
import { EventType } from '../../src/omnisharp/eventType';
1111
import { OmnisharpExtensionExports } from '../../src/csharpExtensionExports';

omnisharptest/omnisharpIntegrationTests/referenceProvider.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import { expect, test, beforeAll, afterAll } from '@jest/globals';
77
import * as vscode from 'vscode';
8-
import OmniSharpReferenceProvider from '../../src/features/referenceProvider';
8+
import OmniSharpReferenceProvider from '../../src/omnisharp/features/referenceProvider';
99
import * as path from 'path';
1010
import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
1111
import { activateCSharpExtension, describeIfNotRazorOrGenerator } from './integrationHelpers';

omnisharptest/omnisharpIntegrationTests/sourceGeneratorDefinitionProvider.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import { expect, test, beforeAll, afterAll } from '@jest/globals';
77
import * as vscode from 'vscode';
88
import * as path from 'path';
9-
import OmniSharpDefinitionProvider from '../../src/features/definitionProvider';
9+
import OmniSharpDefinitionProvider from '../../src/omnisharp/features/definitionProvider';
1010
import { activateCSharpExtension, describeIfGenerator, restartOmniSharpServer } from './integrationHelpers';
1111
import { assertWithPoll, sleep } from './poll';
1212
import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';

omnisharptest/omnisharpIntegrationTests/typeDefinitionProvider.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import { expect, test, beforeAll, afterAll } from '@jest/globals';
77
import * as vscode from 'vscode';
8-
import OmniSharpDefinitionProvider from '../../src/features/definitionProvider';
8+
import OmniSharpDefinitionProvider from '../../src/omnisharp/features/definitionProvider';
99
import * as path from 'path';
1010
import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
1111
import { activateCSharpExtension, describeIfNotRazorOrGenerator, restartOmniSharpServer } from './integrationHelpers';

omnisharptest/omnisharpUnitTests/informationMessageObserver.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import * as vscode from 'vscode';
77
import { jest, describe, test, expect, beforeEach, afterEach } from '@jest/globals';
8-
import { InformationMessageObserver } from '../../src/observers/informationMessageObserver';
8+
import { InformationMessageObserver } from '../../src/omnisharp/observers/informationMessageObserver';
99
import { getUnresolvedDependenices, getWorkspaceConfiguration } from '../../test/unitTests/fakes';
1010
import { Subject, from as observableFrom } from 'rxjs';
1111
import { timeout } from 'rxjs/operators';

0 commit comments

Comments
 (0)