Merge pull request #328 from DotJoshJohnson/feature/284-xpath-context-menu

Add "Get Current XPath" Command to Editor Context Menu

package.json

@@ -245,6 +245,11 @@
                     "command": "xmlTools.minifyXml",
                     "group": "1_modification@100",
                     "when": "editorLangId == 'xml'"
+                },
+                {
+                    "command": "xmlTools.getCurrentXPath",
+                    "group": "z_commands",
+                    "when": "editorLangId == 'xml'"
                 }
             ]
         },
@@ -280,4 +285,4 @@
         "xpath": "0.0.27",
         "xqlint": "^0.4.1"
     }
-}
+}

src/test/extension.test.ts

@@ -107,6 +107,10 @@ describe("V2XmlFormatter", () => {
         it("should not add trailing whitespace", () => {
             testFormatter(xmlFormatter, options, "issue-288");
         });
+
+        it("should handle mixed content on the same line as another element", () => {
+            testFormatter(xmlFormatter, options, "issue-294");
+        });
     });
 
     describe("#minifyXml(xml, options)", () => {

src/test/test-data/issue-294.formatted.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0">
+    <div>
+        ThisCausesBug <img src="test"/>
+        <img src="test"/>
+    </div>
+</xsl:stylesheet>

src/test/test-data/issue-294.unformatted.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0">
+    <div>
+    ThisCausesBug <img src="test"/>
+    <img src="test"/>
+    </div>
+</xsl:stylesheet>