Merge pull request #737 from da-ar/new-fact

(GH-732) Add additional PDK 2.0 functions: fact and function

Author: jpogran

package.json

@@ -165,6 +165,16 @@
         "category": "Puppet",
         "title": "PDK New Defined type"
       },
+      {
+        "command": "extension.pdkNewFact",
+        "category": "Puppet",
+        "title": "PDK New Fact"
+      },
+      {
+        "command": "extension.pdkNewFunction",
+        "category": "Puppet",
+        "title": "PDK New Function"
+      },
       {
         "command": "extension.puppetResource",
         "category": "Puppet",
@@ -262,6 +272,12 @@
         {
           "command": "extension.pdkNewDefinedType"
         },
+        {
+          "command": "extension.pdkNewFact"
+        },
+        {
+          "command": "extension.pdkNewFunction"
+        },
         {
           "command": "extension.puppetResource",
           "when": "editorLangId == 'puppet'"
@@ -292,15 +308,25 @@
           "command": "extension.pdkNewDefinedType",
           "group": "pdk@4"
         },
+        {
+          "when": "editorLangId == 'puppet'",
+          "command": "extension.pdkNewFact",
+          "group": "pdk@5"
+        },
+        {
+          "when": "editorLangId == 'puppet'",
+          "command": "extension.pdkNewFunction",
+          "group": "pdk@6"
+        },
         {
           "when": "editorLangId == 'puppet' ",
           "command": "extension.pdkValidate",
-          "group": "pdk@5"
+          "group": "pdk@7"
         },
         {
           "when": "editorLangId == 'puppet'",
           "command": "extension.pdkTestUnit",
-          "group": "pdk@6"
+          "group": "pdk@8"
         },
         {
           "when": "editorLangId == 'puppet'",
@@ -331,14 +357,24 @@
         },
         {
           "when": "editorLangId == 'puppet'",
-          "command": "extension.pdkValidate",
+          "command": "extension.pdkNewFact",
           "group": "pdk@4"
         },
         {
           "when": "editorLangId == 'puppet'",
-          "command": "extension.pdkTestUnit",
+          "command": "extension.pdkNewFunction",
           "group": "pdk@5"
         },
+        {
+          "when": "editorLangId == 'puppet'",
+          "command": "extension.pdkValidate",
+          "group": "pdk@6"
+        },
+        {
+          "when": "editorLangId == 'puppet'",
+          "command": "extension.pdkTestUnit",
+          "group": "pdk@7"
+        },
         {
           "when": "editorLangId == 'puppet'",
           "command": "puppet.puppetShowNodeGraphToSide",

src/feature/PDKFeature.ts

@@ -47,6 +47,8 @@ export class PDKFeature implements IFeature {
       { id: 'extension.pdkNewClass', request: 'pdk new class', type: 'Puppet class' },
       { id: 'extension.pdkNewTask', request: 'pdk new task', type: 'Bolt task' },
       { id: 'extension.pdkNewDefinedType', request: 'pdk new defined_type', type: 'Puppet defined_type' },
+      { id: 'extension.pdkNewFact', request: 'pdk new fact', type: 'Puppet Fact' },
+      { id: 'extension.pdkNewFunction', request: 'pdk new function', type: 'Puppet Function' },
     ].forEach((command) => {
       context.subscriptions.push(
         vscode.commands.registerCommand(command.id, async () => {

src/messages.ts

@@ -79,6 +79,8 @@ export class PDKCommandStrings {
   static PdkNewModuleCommandId = 'extension.pdkNewModule';
   static PdkNewClassCommandId = 'extension.pdkNewClass';
   static PdkNewTaskCommandId = 'extension.pdkNewTask';
+  static PdkNewFactCommandId = 'extension.pdkNewFact';
+  static PdkNewFunctionCommandId = 'extension.pdkNewFunction';
   static PdkNewDefinedTypeCommandId = 'extension.pdkNewDefinedType';
   static PdkValidateCommandId = 'extension.pdkValidate';
   static PdkTestUnitCommandId = 'extension.pdkTestUnit';