Merge branch 'topic/template_gpr' into 'master'

Add file template for GPR files

See merge request eng/ide/ada_language_server!1939

Author: AnthonyLeonardoGracio

CHANGELOG.md

@@ -12,7 +12,8 @@ section below it for the last release. -->
 * [GNATformat](https://github.com/AdaCore/gnatformat) is now the default back-end for LSP formatting requests
 * Add tasks and a CodeLens to run and debug a given main with GNATemulator on non-native projects
 * Diagnostics are now emitted for issues encountered when trying to load an Alire crate
-* Commands to create a new main units and packages have been added, both available under the `File->New File...` menu
+* Commands to create a new main units, packages and GPR project files have
+  been added, all available under the `File->New File...` menu
 * Add VS Code command `ada: GNATcoverage - Load an existing XML coverage report` for importing coverage reports
 * Support running GNATtest tests in coverage mode
 

integration/vscode/ada/gpr-snippets.json

@@ -1,37 +1,33 @@
 {
     "Case Statement": {
-		"prefix": "case",
-		"scope": "gpr",
-		"body": [
-			"case ${1:Variable} is",
-			"\twhen \"${3:Condition}\" =>",
-			"\t\t$0",
-			"\twhen others =>",
-			"\t\t$2",
-			"end case;"
-		],
-		"description": "Case Statement"
+        "prefix": "case",
+        "scope": "gpr",
+        "body": [
+            "case ${1:Variable} is",
+            "\twhen \"${3:Condition}\" =>",
+            "\t\t$0",
+            "\twhen others =>",
+            "\t\t$2",
+            "end case;"
+        ],
+        "description": "Case Statement"
     },
     "Package Declaration": {
-		"prefix": "package",
-		"scope": "gpr",
-		"body": [
-			"package ${1|Binder,Builder,Check,Clean,Compiler,Cross_Reference,Documentation,Eliminate,Finder,Gnatls,Gnatstub,IDE,Install,Linker,Metrics,Naming,Pretty_Printer,Remote,Stack,Synchronize|} is",
-			"\t$0",
-			"end $1;"
-		],
-		"description": "Package Declaration"
-	},
+        "prefix": "package",
+        "scope": "gpr",
+        "body": [
+            "package ${1|Binder,Builder,Check,Clean,Compiler,Cross_Reference,Documentation,Eliminate,Finder,Gnatls,Gnatstub,IDE,Install,Linker,Metrics,Naming,Pretty_Printer,Remote,Stack,Synchronize|} is",
+            "\t$0",
+            "end $1;"
+        ],
+        "description": "Package Declaration"
+    },
     "Package Extension": {
-		"prefix": "package",
-		"scope": "gpr",
-		"body": [
-			"package ${1:Name} extends ${2} is",
-			"\t$0",
-			"end $1;"
-		],
-		"description": "Package Extension"
-	},
+        "prefix": "package",
+        "scope": "gpr",
+        "body": ["package ${1:Name} extends ${2} is", "\t$0", "end $1;"],
+        "description": "Package Extension"
+    },
     "Project Declaration": {
         "prefix": "project",
         "scope": "gpr",

integration/vscode/ada/package.json

@@ -784,6 +784,11 @@
                 "title": "Ada: Create Package",
                 "shortTitle": "Ada Package"
             },
+            {
+                "command": "ada.createNewGPRProjectFile",
+                "title": "Ada: Create GPR Project File",
+                "shortTitle": "GPR Project File"
+            },
             {
                 "command": "ada.otherFile",
                 "title": "Ada: Go to other file"
@@ -937,6 +942,10 @@
                 {
                     "command": "ada.createNewAdaPackage",
                     "group": "ada"
+                },
+                {
+                    "command": "ada.createNewGPRProjectFile",
+                    "group": "ada"
                 }
             ]
         },

integration/vscode/ada/src/commands.ts

@@ -96,12 +96,17 @@ export function registerCommands(context: vscode.ExtensionContext, clients: Exte
     context.subscriptions.push(vscode.commands.registerCommand('ada.otherFile', otherFileHandler));
     context.subscriptions.push(
         vscode.commands.registerCommand('ada.createNewAdaMainUnit', () =>
-            createNewAdaFile('Main Procedure'),
+            createNewFile('ada', 'Main Procedure'),
         ),
     );
     context.subscriptions.push(
         vscode.commands.registerCommand('ada.createNewAdaPackage', () =>
-            createNewAdaFile('Package Declaration or Body'),
+            createNewFile('ada', 'Package Declaration or Body'),
+        ),
+    );
+    context.subscriptions.push(
+        vscode.commands.registerCommand('ada.createNewGPRProjectFile', () =>
+            createNewFile('gpr', 'Project Declaration'),
         ),
     );
     context.subscriptions.push(
@@ -463,17 +468,19 @@ async function buildAndRunMainAsk() {
 }
 
 /**
- * Handler for commands that create new Ada files.
- * This function creates a new Ada editor, focus it, and insert the specified snippet.
- * Used to proivide Ada file templates.
+ * Handler for commands that create new files.
+ * This function creates a new editor for the given language, focus it,
+ * and insert the specified snippet.
+ * Used to proivide Ada/GPR file templates.
  *
+ * @param langId - the new file's language ID (e.g: 'ada' or 'gpr')
  * @param snippetName - the name of the snippet to insert in the newly created editor.
  */
-async function createNewAdaFile(snippetName: string) {
+async function createNewFile(langId: string, snippetName: string) {
     const doc = await vscode.workspace.openTextDocument({ language: 'ada' });
     await vscode.window.showTextDocument(doc);
     await vscode.commands.executeCommand('editor.action.insertSnippet', {
-        langId: 'ada',
+        langId: langId,
         name: snippetName,
     });
 }