Merge pull request #1681 from cake-build/feature/cake

[WIP] Cake support

package.json

@@ -206,9 +206,11 @@
     "workspaceContains:*.csproj",
     "workspaceContains:*.sln",
     "workspaceContains:*.csx",
+    "workspaceContains:*.cake",
     "workspaceContains:**/*.csproj",
     "workspaceContains:**/*.sln",
-    "workspaceContains:**/*.csx"
+    "workspaceContains:**/*.csx",
+    "workspaceContains:**/*.cake"
   ],
   "contributes": {
     "configuration": {

src/features/status.ts

@@ -27,7 +27,8 @@ let defaultSelector: vscode.DocumentSelector = [
     { pattern: '**/project.json' }, // project.json-files OR
     { pattern: '**/*.sln' }, // any solution file OR
     { pattern: '**/*.csproj' }, // an csproj file
-    { pattern: '**/*.csx' } // C# script
+    { pattern: '**/*.csx' }, // C# script
+    { pattern: '**/*.cake' } // Cake script
 ];
 
 class Status {

src/omnisharp/launcher.ts

@@ -17,7 +17,8 @@ export enum LaunchTargetKind {
     Solution,
     ProjectJson,
     Folder,
-    Csx
+    Csx,
+    Cake
 }
 
 /**
@@ -45,7 +46,7 @@ export function findLaunchTargets(): Thenable<LaunchTarget[]> {
     const options = Options.Read();
 
     return vscode.workspace.findFiles(
-        /*include*/ '{**/*.sln,**/*.csproj,**/project.json,**/*.csx}', 
+        /*include*/ '{**/*.sln,**/*.csproj,**/project.json,**/*.csx,**/*.cake}', 
         /*exclude*/ '{**/node_modules/**,**/.git/**,**/bower_components/**}',
         /*maxResults*/ options.maxProjectResults)
     .then(resources => {
@@ -74,7 +75,8 @@ function select(resources: vscode.Uri[], rootPath: string): LaunchTarget[] {
         hasSlnFile = false,
         hasProjectJson = false,
         hasProjectJsonAtRoot = false,
-        hasCSX = false;
+        hasCSX = false,
+        hasCake = false;
 
     hasCsProjFiles = resources.some(isCSharpProject);
 
@@ -111,6 +113,11 @@ function select(resources: vscode.Uri[], rootPath: string): LaunchTarget[] {
         if (!hasCSX && isCsx(resource)) {
             hasCSX = true;
         }
+
+        // Discover if there is any Cake file
+        if (!hasCake && isCake(resource)) {
+            hasCake = true;
+        }
     });
 
     // Add the root folder under the following circumstances:
@@ -137,6 +144,17 @@ function select(resources: vscode.Uri[], rootPath: string): LaunchTarget[] {
         });
     }
 
+    // if we noticed any Cake file(s), add a single Cake-specific target pointing at the root folder
+    if (hasCake) {
+        targets.push({
+            label: "Cake",
+            description: path.basename(rootPath),
+            target: rootPath,
+            directory: rootPath,
+            kind: LaunchTargetKind.Cake
+        });
+    }
+
     return targets.sort((a, b) => a.directory.localeCompare(b.directory));
 }
 
@@ -156,6 +174,10 @@ function isCsx(resource: vscode.Uri): boolean {
     return /\.csx$/i.test(resource.fsPath);
 }
 
+function isCake(resource: vscode.Uri): boolean {
+    return /\.cake$/i.test(resource.fsPath);
+}
+
 export interface LaunchResult {
     process: ChildProcess;
     command: string;

src/omnisharp/protocol.ts

@@ -279,6 +279,7 @@ export interface WorkspaceInformationResponse {
     MsBuild?: MsBuildWorkspaceInformation;
     DotNet?: DotNetWorkspaceInformation;
     ScriptCs?: ScriptCsContext;
+    Cake?: CakeContext;
 }
 
 export interface MsBuildWorkspaceInformation {
@@ -294,6 +295,10 @@ export interface ScriptCsContext {
     Path: string;
 }
 
+export interface CakeContext {
+    Path: string;
+}
+
 export interface MSBuildProject {
     ProjectGuid: string;
     Path: string;

src/omnisharp/server.ts

@@ -367,11 +367,11 @@ export class OmniSharpServer {
     public autoStart(preferredPath: string): Thenable<void> {
         return findLaunchTargets().then(launchTargets => {
             // If there aren't any potential launch targets, we create file watcher and try to
-            // start the server again once a *.sln, *.csproj, project.json or CSX file is created.
+            // start the server again once a *.sln, *.csproj, project.json, CSX or Cake file is created.
             if (launchTargets.length === 0) {
                 return new Promise<void>((resolve, reject) => {
                     // 1st watch for files
-                    let watcher = vscode.workspace.createFileSystemWatcher('{**/*.sln,**/*.csproj,**/project.json,**/*.csx}',
+                    let watcher = vscode.workspace.createFileSystemWatcher('{**/*.sln,**/*.csproj,**/project.json,**/*.csx,**/*.cake}',
                         /*ignoreCreateEvents*/ false,
                         /*ignoreChangeEvents*/ true,
                         /*ignoreDeleteEvents*/ true);