Merge pull request #61 from devuxd/AddNewCommand

added a new websocket command
ourcodeinc · May 22, 2024 · 05c262d · 05c262d
2 parents 113d181 + 2beaa64
commit 05c262d
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 15 deletions.
diff --git a/src/core/coreConstants.js b/src/core/coreConstants.js
@@ -2,6 +2,7 @@ export const webSocketSendMessage = {
     modified_rule_msg: "MODIFIED_RULE",
     modified_tag_msg: "MODIFIED_TAG",
     snippet_xml_msg: "XML_RESULT",
+    converted_java_snippet_msg: "CONVERTED_JAVA_SNIPPET",
     code_to_xml_msg: "EXPR_STMT",
     new_rule_msg: "NEW_RULE",
     new_tag_msg: "NEW_TAG",

diff --git a/src/core/utilities.js b/src/core/utilities.js
@@ -14,6 +14,7 @@ class Utilities {
      */
     static sendToServer(ws, command, data) {
         let messageJson = {command: command};
+        let secondMessageJson = null;
 
         if (ws) {
             switch (command) {
@@ -34,6 +35,13 @@ class Utilities {
                         fileName: data.fileName,
                         xml: data.xml
                     };
+                    secondMessageJson = {
+                        command: webSocketSendMessage.converted_java_snippet_msg,
+                        data: {
+                            fileName: data.fileName,
+                            convertedJava: Utilities.removeSrcmlAnnotations(data.xml)
+                        }
+                    };
                     break;
 
                 case webSocketSendMessage.code_to_xml_msg:
@@ -88,6 +96,8 @@ class Utilities {
             }
 
             ws.send(JSON.stringify(messageJson));
+            if (secondMessageJson)
+                ws.send(JSON.stringify(secondMessageJson))
         }
     }
 
@@ -219,6 +229,19 @@ class Utilities {
         return indices;
     }
 
+    static removeSrcmlAnnotations(xmlString) {
+        // removes srcml tags
+        xmlString = xmlString.replace(/<[^>]*>/g, "");
+        // replaces &lt; with <
+        xmlString = xmlString.replace(/&lt;/g, "<");
+        // replaces &gt; with >
+        xmlString = xmlString.replace(/&gt;/g, ">");
+        // replaces &amp; with &
+        xmlString = xmlString.replace(/&amp;/g, "&");
+
+        return xmlString;
+    }
+
 }
 
 export default Utilities;
diff --git a/src/ui/rulePanel.js b/src/ui/rulePanel.js
@@ -505,28 +505,15 @@ class SnippetView extends Component {
         };
     }
 
-    removeAnnotations(xmlString) {
-        // removes srcml tags
-        xmlString = xmlString.replace(/<[^>]*>/g, "");
-        // replaces &lt; with <
-        xmlString = xmlString.replace(/&lt;/g, "<");
-        // replaces &gt; with >
-        xmlString = xmlString.replace(/&gt;/g, ">");
-        // replaces &amp; with &
-        xmlString = xmlString.replace(/&amp;/g, "&");
-
-        return xmlString;
-    }
-
     handleSuggestion = async (
         rule,
         example,
         snippet,
         exampleFilePath,
         violationFilePath,
     ) => {
-        const parsedSnippet = this.removeAnnotations(snippet);
-        const parsedExample = this.removeAnnotations(example);
+        const parsedSnippet = Utilities.removeSrcmlAnnotations(snippet);
+        const parsedExample = Utilities.removeSrcmlAnnotations(example);
         // prevent multiple calls to suggestFix
         if (!this.state.suggestionCreated) {
             suggestFix(