Merge pull request #5382 from xieyubo/release

Add projectFilesIncludePattern & projectFilesExcludePattern options.
dotnet · Sep 23, 2022 · 9336244 · 9336244
2 parents 55bc054 + dc861dc
commit 9336244
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/package.json b/package.json
@@ -1013,6 +1013,11 @@
           "default": true,
           "description": "Specifies whether the OmniSharp server will be automatically started or not. If false, OmniSharp can be started with the 'Restart OmniSharp' command"
         },
+        "omnisharp.projectFilesExcludePattern" :{
+          "type": "string",
+          "default": "**/node_modules/**,**/.git/**,**/bower_components/**",
+          "description": "The exclude pattern used by OmniSharp to find all project files."
+        },
         "omnisharp.projectLoadTimeout": {
           "type": "number",
           "default": 60,

diff --git a/src/omnisharp/launcher.ts b/src/omnisharp/launcher.ts
@@ -65,7 +65,7 @@ export async function findLaunchTargets(options: Options): Promise<LaunchTarget[
 
     const projectFiles = await vscode.workspace.findFiles(
         /*include*/ '{**/*.sln,**/*.slnf,**/*.csproj,**/project.json,**/*.csx,**/*.cake}',
-        /*exclude*/ '{**/node_modules/**,**/.git/**,**/bower_components/**}');
+        /*exclude*/ `{${options.projectFilesExcludePattern}}`);
 
     const csFiles = await vscode.workspace.findFiles(
         /*include*/ '{**/*.cs}',

diff --git a/src/omnisharp/options.ts b/src/omnisharp/options.ts
@@ -12,6 +12,7 @@ export class Options {
         public waitForDebugger: boolean,
         public loggingLevel: string,
         public autoStart: boolean,
+        public projectFilesExcludePattern: string,
         public projectLoadTimeout: number,
         public maxProjectResults: number,
         public useEditorFormattingSettings: boolean,
@@ -94,6 +95,7 @@ export class Options {
 
         const autoStart = omnisharpConfig.get<boolean>('autoStart', true);
 
+        const projectFilesExcludePattern = omnisharpConfig.get<string>('projectFilesExcludePattern', '**/node_modules/**,**/.git/**,**/bower_components/**');
         const projectLoadTimeout = omnisharpConfig.get<number>('projectLoadTimeout', 60);
         const maxProjectResults = omnisharpConfig.get<number>('maxProjectResults', 250);
         const defaultLaunchSolution = omnisharpConfig.get<string>('defaultLaunchSolution', '');
@@ -157,6 +159,7 @@ export class Options {
             waitForDebugger,
             loggingLevel,
             autoStart,
+            projectFilesExcludePattern,
             projectLoadTimeout,
             maxProjectResults,
             useEditorFormattingSettings,

diff --git a/test/unitTests/Fakes/FakeOptions.ts b/test/unitTests/Fakes/FakeOptions.ts
@@ -12,6 +12,7 @@ export function getEmptyOptions(): Options {
         /* waitForDebugger */false,
         /* loggingLevel */"",
         /* autoStart */false,
+        /* projectFilesExcludePattern */"",
         /* projectLoadTimeout */0,
         /* maxProjectResults */0,
         /* useEditorFormattingSettings */false,