fix: Ensure projects are loaded when opening Project Explorer

joelday · joelday · commit 92173a8ee1d7 · 2019-07-03T20:14:25.000-07:00
diff --git a/src/DarkId.Papyrus.Server/Features/ProjectInfosHandler.cs b/src/DarkId.Papyrus.Server/Features/ProjectInfosHandler.cs
@@ -31,6 +31,11 @@ public ProjectInfosHandler(ProjectManager projectManager, ILogger<ProjectInfosHa
 
         public Task<ProjectInfos> Handle(ProjectInfosParams request, CancellationToken cancellationToken)
         {
+            if (!_projectManager.Projects.Any())
+            {
+                _projectManager.UpdateProjects();
+            }
+
             return Task.FromResult(new ProjectInfos()
             {
                 Projects = new Container<ProjectInfo>(_projectManager.Projects.AsParallel().AsOrdered().Select(p =>
@@ -61,7 +66,7 @@ public Task<ProjectInfos> Handle(ProjectInfosParams request, CancellationToken c
                         }) : Enumerable.Empty<ProjectInfoSourceInclude>())
                     };
                 }))
-            }); 
+            });
         }
 
         public void SetCapability(ProjectInfosCapability capability)
diff --git a/src/DarkId.Papyrus.Server/ProjectManager.cs b/src/DarkId.Papyrus.Server/ProjectManager.cs
@@ -86,7 +86,7 @@ public Task PublishDiagnosticsForFilePath(string filePath)
 
         // RefreshSources is for when files are added or removed.
         // ReloadProjects is for when a project or flags file has changed.
-        public void UpdateProjects(UpdateProjectsOptions options)
+        public void UpdateProjects(UpdateProjectsOptions options = UpdateProjectsOptions.None)
         {
             lock (_lock)
             {
diff --git a/src/papyrus-lang-vscode/package.json b/src/papyrus-lang-vscode/package.json
@@ -49,24 +49,40 @@
                         "required": [
                             "game"
                         ]
+                    },
+                    "launch": {
+                        "properties": {
+                            "game": {
+                                "type": "string",
+                                "enum": [
+                                    "fallout4"
+                                ]
+                            },
+                            "projectPath": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "game"
+                        ]
                     }
                 },
                 "configurationSnippets": [
                     {
-                        "label": "Papyrus: Fallout 4 (Creation Kit)",
+                        "label": "Papyrus: Fallout 4",
                         "body": {
                             "name": "Fallout 4",
                             "type": "papyrus",
-                            "request": "attach",
+                            "request": "launch",
                             "game": "fallout4"
                         }
                     },
                     {
-                        "label": "Papyrus: Fallout 4 (.ppj)",
+                        "label": "Papyrus: Fallout 4 (with .ppj)",
                         "body": {
                             "name": "Fallout 4 Project",
                             "type": "papyrus",
-                            "request": "attach",
+                            "request": "launch",
                             "game": "fallout4",
                             "projectPath": "^\"\\${workspaceFolder}/${1:Project.ppj}\""
                         }
@@ -213,7 +229,7 @@
             {
                 "category": "Debug",
                 "command": "papyrus.fallout4.attachDebugger",
-                "title": "Attach to Fallout 4"
+                "title": "Debug Fallout 4"
             },
             {
                 "category": "Papyrus",

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,11 @@ public ProjectInfosHandler(ProjectManager projectManager, ILogger<ProjectInfosHa`
`31`	`31`
`32`	`32`	`public Task<ProjectInfos> Handle(ProjectInfosParams request, CancellationToken cancellationToken)`
`33`	`33`	`{`
	`34`	`+ if (!_projectManager.Projects.Any())`
	`35`	`+ {`
	`36`	`+ _projectManager.UpdateProjects();`
	`37`	`+ }`
	`38`	`+`
`34`	`39`	`return Task.FromResult(new ProjectInfos()`
`35`	`40`	`{`
`36`	`41`	`Projects = new Container<ProjectInfo>(_projectManager.Projects.AsParallel().AsOrdered().Select(p =>`
`@@ -61,7 +66,7 @@ public Task<ProjectInfos> Handle(ProjectInfosParams request, CancellationToken c`
`61`	`66`	`}) : Enumerable.Empty<ProjectInfoSourceInclude>())`
`62`	`67`	`};`
`63`	`68`	`}))`
`64`		`- });`
	`69`	`+ });`
`65`	`70`	`}`
`66`	`71`
`67`	`72`	`public void SetCapability(ProjectInfosCapability capability)`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public Task PublishDiagnosticsForFilePath(string filePath)`
`86`	`86`
`87`	`87`	`// RefreshSources is for when files are added or removed.`
`88`	`88`	`// ReloadProjects is for when a project or flags file has changed.`
`89`		`- public void UpdateProjects(UpdateProjectsOptions options)`
	`89`	`+ public void UpdateProjects(UpdateProjectsOptions options = UpdateProjectsOptions.None)`
`90`	`90`	`{`
`91`	`91`	`lock (_lock)`
`92`	`92`	`{`