Add joingContentLines preference and fix README/CHANGELOG

Signed-off-by: Nikolas Komonen <nikolaskomonen@gmail.com>

Author: NikolasKomonen

CHANGELOG.md

@@ -1,13 +1,12 @@
 # Change Log
 
-## [0.4.0](https://github.com/redhat-developer/vscode-xml/milestone/4?closed=1) (March 06, 2019)
+## [0.4.0](https://github.com/redhat-developer/vscode-xml/milestone/4?closed=1) (March 07, 2019)
 
 ### Enhancements
 
 * Modified schema validation messages. See [#91](https://github.com/redhat-developer/vscode-xml/issues/91).
 * Preference `xml.format.quotations` to set single vs double quotes for attribute values on format. See [lsp4xml#263](https://github.com/angelozerr/lsp4xml/issues/263).
 * Preference `xml.format.preserveEmptyContent` to preserve a whitespace value in an element's content. See [#96](https://github.com/redhat-developer/vscode-xml/issues/96).
-* Removed support for preference `xml.format.joinContentLines`.
 * Compatibility with OSGi and p2. See [lsp4xml#288](https://github.com/angelozerr/lsp4xml/issues/288).
 
 ### Bug Fixes

README.md

@@ -53,6 +53,7 @@ The following settings are supported:
 * `xml.fileAssociations` : Associate XML Schemas to XML file patterns.
 * `xml.format.splitAttributes` : Set to `true` to split node attributes onto multiple lines during formatting. Defaults to `false`.
 * `xml.format.joinCDATALines` : Set to `true` to join lines in CDATA content during formatting. Defaults to `false`.
+* `xml.format.joinContentLines` : Set to `true` to join lines in node content during formatting. Defaults to `false`.
 * `xml.format.joinCommentLines` : Set to `true` to join lines in comments during formatting. Defaults to `false`.
 * `xml.format.enabled` : Enable/disable formatting.
 * `xml.autoCloseTags.enabled` : Enable/disable automatic tag closing.  

package.json

@@ -112,6 +112,12 @@
           "description": "Insert space before end of self closing tag. \nExample:\n  <tag/> -> <tag />",
           "scope": "window"
         },
+        "xml.format.joinContentLines": {
+          "type": "boolean",
+          "default": false,
+          "description": "Normalize the whitespace of content inside an element. Newlines and excess whitespace are removed.",
+          "scope": "window"
+        },
         "xml.format.preserveEmptyContent": {
           "type": "boolean",
           "default": false,