Add settings and project settings contribution files (#759)

extensions/lib/add-remotes.ts

@@ -13,7 +13,7 @@ import {
   try {
     await execGitCommand(`git remote add ${MULTI_TEMPLATE_NAME} ${MULTI_TEMPLATE_URL}`);
   } catch (e) {
-    if (e.toString().includes(ERROR_STRINGS.multiRemoteExists))
+    if (e.toString().toLowerCase().includes(ERROR_STRINGS.multiRemoteExists.toLowerCase()))
       console.log(`Remote ${MULTI_TEMPLATE_NAME} already exists. This is likely not a problem.`);
     else {
       console.error(`Error on adding remote ${MULTI_TEMPLATE_NAME}: ${e}`);
@@ -25,7 +25,7 @@ import {
   try {
     await execGitCommand(`git remote add ${SINGLE_TEMPLATE_NAME} ${SINGLE_TEMPLATE_URL}`);
   } catch (e) {
-    if (e.toString().includes(ERROR_STRINGS.singleRemoteExists))
+    if (e.toString().toLowerCase().includes(ERROR_STRINGS.singleRemoteExists.toLowerCase()))
       console.log(`Remote ${SINGLE_TEMPLATE_NAME} already exists. This is likely not a problem.`);
     else {
       console.error(`Error on adding remote ${SINGLE_TEMPLATE_NAME}: ${e}`);

extensions/lib/update-from-templates.ts

@@ -65,7 +65,9 @@ import { ExtensionInfo, getExtensions, subtreeRootFolder } from '../webpack/webp
         e
           .toString()
           .toLowerCase()
-          .includes(ERROR_STRINGS.subtreeNeverAdded.replace('{0}', ext.dirPathOSIndependent))
+          .includes(
+            ERROR_STRINGS.subtreeNeverAdded.replace('{0}', ext.dirPathOSIndependent).toLowerCase(),
+          )
       )
         // If this folder isn't a subtree, it may be intentionally not based on the template. Continue
         console.warn(

extensions/src/hello-someone/contributions/projectSettings.json

@@ -0,0 +1 @@
+[]

extensions/src/hello-someone/contributions/settings.json

@@ -0,0 +1 @@
+[]

extensions/src/hello-someone/manifest.json

@@ -6,6 +6,9 @@
   "license": "MIT",
   "main": "src/main.ts",
   "types": "src/types/hello-someone.d.ts",
+  "menus": "contributions/menus.json",
+  "settings": "contributions/settings.json",
+  "projectSettings": "contributions/projectSettings.json",
   "activationEvents": [
     "onCommand:helloSomeone.helloSomeone",
     "onCommand:helloSomeone.echoSomeoneRenderer"

extensions/src/hello-world/contributions/projectSettings.json

@@ -0,0 +1 @@
+[]

extensions/src/hello-world/contributions/settings.json

@@ -0,0 +1 @@
+[]

extensions/src/hello-world/manifest.json

@@ -6,5 +6,8 @@
   "license": "MIT",
   "main": "src/main.ts",
   "types": "src/types/hello-world.d.ts",
+  "menus": "contributions/menus.json",
+  "settings": "contributions/settings.json",
+  "projectSettings": "contributions/projectSettings.json",
   "activationEvents": ["onCommand:helloWorld.helloWorld", "onCommand:helloWorld.helloException"]
 }

extensions/src/quick-verse/contributions/projectSettings.json

@@ -0,0 +1 @@
+[]

extensions/src/quick-verse/contributions/settings.json

@@ -0,0 +1 @@
+[]

extensions/src/quick-verse/manifest.json

@@ -6,5 +6,8 @@
   "license": "MIT",
   "main": "src/main.ts",
   "types": "src/types/quick-verse.d.ts",
+  "menus": "contributions/menus.json",
+  "settings": "contributions/settings.json",
+  "projectSettings": "contributions/projectSettings.json",
   "activationEvents": []
 }

extensions/src/resource-viewer/contributions/projectSettings.json

@@ -0,0 +1 @@
+[]

extensions/src/resource-viewer/contributions/settings.json

@@ -0,0 +1 @@
+[]

extensions/src/resource-viewer/manifest.json

@@ -6,5 +6,8 @@
   "license": "MIT",
   "main": "src/main.ts",
   "types": "src/types/resource-viewer.d.ts",
+  "menus": "contributions/menus.json",
+  "settings": "contributions/settings.json",
+  "projectSettings": "contributions/projectSettings.json",
   "activationEvents": []
 }

extensions/webpack/webpack.util.ts

@@ -137,14 +137,20 @@ const staticFiles: {
   { from: '<types>', noErrorOnMissing: true },
   // Copy the menu JSON file into the output folder based on its listing in `manifest.menus`
   { from: '<menus>', noErrorOnMissing: true },
+  // Copy the settings JSON file into the output folder based on its listing in `manifest.settings`
+  { from: '<settings>', noErrorOnMissing: true },
+  // Copy the project settings JSON file into the output folder based on its listing in `manifest.projectSettings`
+  { from: '<project_settings>', noErrorOnMissing: true },
 ];
 
 /** Get the actual static file name from the template static file name */
 function getStaticFileName(staticFile: string, extensionInfo: ExtensionInfo) {
   return staticFile
     .replace(/<name>/g, extensionInfo.name)
     .replace(/<types>/g, extensionInfo.types ?? '')
-    .replace(/<menus>/g, extensionInfo.menus ?? '');
+    .replace(/<menus>/g, extensionInfo.menus ?? '')
+    .replace(/<settings>/g, extensionInfo.menus ?? '')
+    .replace(/<project_settings>/g, extensionInfo.menus ?? '');
 }
 
 /** Get CopyFile plugin patterns for copying static files for an extension */
@@ -286,6 +292,10 @@ type ExtensionManifest = {
   types?: string;
   /** Path to the JSON file that defines the menu items this extension is adding. */
   menus?: string;
+  /** Path to the JSON file that defines the settings this extension is adding. */
+  settings?: string;
+  /** Path to the JSON file that defines the project settings this extension is adding. */
+  projectSettings?: string;
   activationEvents: string[];
 };
 

lib/papi-dts/papi.d.ts

@@ -4190,6 +4190,12 @@ declare module 'extension-host/extension-types/extension-manifest.model' {
      * for more information about extension type declaration files.
      */
     types?: string;
+    /** Path to the JSON file that defines the menu items this extension is adding. */
+    menus?: string;
+    /** Path to the JSON file that defines the settings this extension is adding. */
+    settings?: string;
+    /** Path to the JSON file that defines the project settings this extension is adding. */
+    projectSettings?: string;
     /**
      * List of events that occur that should cause this extension to be activated. Not yet
      * implemented.

src/extension-host/extension-types/extension-manifest.model.ts

@@ -32,6 +32,10 @@ export type ExtensionManifest = {
   types?: string;
   /** Path to the JSON file that defines the menu items this extension is adding. */
   menus?: string;
+  /** Path to the JSON file that defines the settings this extension is adding. */
+  settings?: string;
+  /** Path to the JSON file that defines the project settings this extension is adding. */
+  projectSettings?: string;
   /**
    * List of events that occur that should cause this extension to be activated. Not yet
    * implemented.