XData code editing

Author: nikitaeverywhere

package.json

@@ -2,7 +2,7 @@
   "name": "cache-visual-editor",
   "printableName": "Cache Visual Editor",
   "packageName": "VisualEditor",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "description": "Visual class editor for InterSystems Caché",
   "main": "index.js",
   "keywords": [

source/client/js/classEditor/class/MANIFEST.js

@@ -598,7 +598,8 @@ export default {
             ignore: true,
             isCode: true,
             returnTypeProperty: "ReturnType",
-            formalSpecProperty: "FormalSpec"
+            formalSpecProperty: "FormalSpec",
+            routineSwitchSupport: true
         },
         Language: {
             default: "",
@@ -800,7 +801,8 @@ export default {
     XDatas: {
         Data: {
             ignore: true, // xData data edit has special controls
-            default: ""
+            default: "",
+            isCode: true
         },
         Deprecated: {
             default: 0,

source/client/js/classEditor/class/code.js

@@ -21,13 +21,15 @@ function switchToRoutineCode (code) {
     return code.replace(/^/, "\t").replace(/\n/g, "\n\t");
 }
 
-export function getCodeCaptionView ({ manifest, name, data, savePath }) {
+export function getCodeCaptionView ({ memberManifest, codePropertyName, data, savePath }) {
 
     let div = block(`div`, `property-block`),
         header = block(`div`),
         editBlock = block(`div`, `editor`),
-        code = (data[name] || "").replace(/\r?\n$/, ``),
-        returnTypeProp = (manifest[name] || {})["returnTypeProperty"] || ``,
+        code = (data[codePropertyName] || "").replace(/\r?\n$/, ``),
+        keywordManifest = (memberManifest[codePropertyName] || {}),
+        returnTypeProp = keywordManifest["returnTypeProperty"] || ``,
+        formalSpecProperty = keywordManifest["formalSpecProperty"] || ``,
         ROUTINE_SUPPORT = hasRoutineCode(code),
         useRoutinesToggle = toggle(ROUTINE_SUPPORT),
         useRoutinesBlock = block(`div`, `property-block`),
@@ -42,27 +44,36 @@ export function getCodeCaptionView ({ manifest, name, data, savePath }) {
 
     function saveChanges () {
         let value = editor.getValue();
-        addChange(savePath.concat(name), ROUTINE_SUPPORT ? value : switchToRoutineCode(value));
+        addChange(
+            savePath.concat(codePropertyName),
+            ROUTINE_SUPPORT ? value : switchToRoutineCode(value)
+        );
     }
 
     nb.textContent = `Use Routines`;
     vb.appendChild(useRoutinesToggle);
     useRoutinesBlock.appendChild(nb);
     useRoutinesBlock.appendChild(vb);
-    signatureElem.appendChild(block(`span`, `secondary`, `Takes `));
-    signatureElem.appendChild(getFormalSpecEditor({
-        formalSpec: data[`FormalSpec`],
-        savePath: savePath.concat(`FormalSpec`)
-    }));
+    if (formalSpecProperty) {
+        signatureElem.appendChild(block(`span`, `secondary`, `Takes `));
+        signatureElem.appendChild(getFormalSpecEditor({
+            formalSpec: data[`FormalSpec`],
+            savePath: savePath.concat(`FormalSpec`)
+        }));
+    }
     if (returnTypeProp) {
-        signatureElem.appendChild(block(`span`, `secondary`, ` Returns `));
+        signatureElem.appendChild(
+            block(`span`, `secondary`, `${ formalSpecProperty ? " " : "" }Returns `)
+        );
         signatureElem.appendChild(typeInput);
         typeInput.addEventListener(`input`, () => {
             addChange(savePath.concat(returnTypeProp), typeInput.value);
         });
     }
     header.appendChild(signatureElem);
-    header.appendChild(useRoutinesBlock);
+
+    if (keywordManifest["routineSwitchSupport"])
+        header.appendChild(useRoutinesBlock);
 
     useRoutinesToggle.checkbox.addEventListener("change", () => {
         let value = editor.getValue(),

source/client/js/classEditor/class/member.js

@@ -56,8 +56,8 @@ function getMemberDetailedBlock (classData, memberType, classMemberName) {
 
     if (codePropName)
         container.appendChild(getCodeCaptionView({
-            manifest: MANIFEST[isClass ? "Class" : memberType] || {},
-            name: codePropName,
+            memberManifest: MANIFEST[isClass ? "Class" : memberType] || {},
+            codePropertyName: codePropName,
             data: data,
             savePath
         }));
@@ -191,7 +191,7 @@ function enableMember ({
         }
         headerElement.classList.toggle("opened");
 
-        if (classBlockName === "Methods") {
+        if (classBlockName === "Methods" || classBlockName === "XDatas") {
             classData[`__visualCodeBlocksOpened`] += opened ? 1 : -1;
             updateGridElement(classData[`__visualClassElement`], {
                 width: classData[`__visualCodeBlocksOpened`] > 0 ? 2 : 1