Improve JSON prettify

- Fix text wrapping
- Do not add additional line breaks to formatted json

Fix #4654

Author: uglide

src/qml/value-editor/editors/MultilineEditor.qml

@@ -285,6 +285,8 @@ ColumnLayout
             anchors.fill: parent
             anchors.margins: 5
 
+            verticalScrollBarPolicy: Qt.ScrollBarAlwaysOn
+
             ListView {
                 id: textView
                 anchors.fill: parent
@@ -298,7 +300,7 @@ ColumnLayout
                     NewTextArea {
                         id: textAreaPart
                         objectName: "rdm_key_multiline_text_field_" + index
-                        width: textView.width
+                        width: texteditorWrapper.width
                         height: textAreaPart.contentHeight < texteditorWrapper.height? texteditorWrapper.height - 5 : textAreaPart.contentHeight
 
                         enabled: root.enabled

src/qml/value-editor/editors/formatters/formatters.js

@@ -61,7 +61,8 @@ var json = {
 
     getFormatted: function (raw, callback) {
         try {
-            return callback("", JSONFormatter.prettyPrint(String(raw)), false, FORMAT_HTML)
+            // NOTE(u_glide): Minify json before processing to get rid of double formatted JSON
+            return callback("", JSONFormatter.prettyPrint(JSONFormatter.minify(String(raw))), false, FORMAT_HTML)
         } catch (e) {
             return callback(qsTranslate("RDM", "Invalid JSON: ") + e)
         }

src/qml/value-editor/editors/formatters/json-tools.js

@@ -88,8 +88,7 @@ var prettyPrint = function( json ) {
 
     var highlighted = syntaxHighlight(out);
 
-//    return out;
-    return '<pre id="value">' + highlighted + '</pre>';
+    return '<pre id="value" style="width:97%; white-space: pre-wrap;">' + highlighted + '</pre>';
 };