Fix last character of JSX text nodes being cut off (#1694)

Author: bradchristensen

internal/transformers/jsxtransforms/jsx.go

@@ -794,15 +794,15 @@ func fixupWhitespaceAndDecodeEntities(text string) string {
 	// Last non-whitespace character on this line.
 	lastNonWhitespace := -1
 	// These initial values are special because the first line is:
-	// firstNonWhitespace = 0 to indicate that we want leading whitsepace,
+	// firstNonWhitespace = 0 to indicate that we want leading whitespace,
 	// but lastNonWhitespace = -1 as a special flag to indicate that we *don't* include the line if it's all whitespace.
 	for i := 0; i < len(text); i++ {
 		c, size := utf8.DecodeRuneInString(text[i:])
 		if stringutil.IsLineBreak(c) {
 			// If we've seen any non-whitespace characters on this line, add the 'trim' of the line.
 			// (lastNonWhitespace === -1 is a special flag to detect whether the first line is all whitespace.)
 			if firstNonWhitespace != -1 && lastNonWhitespace != -1 {
-				addLineOfJsxText(acc, text[firstNonWhitespace:lastNonWhitespace], initial)
+				addLineOfJsxText(acc, text[firstNonWhitespace:lastNonWhitespace+1], initial)
 				initial = false
 			}
 

testdata/baselines/reference/submodule/compiler/errorSpanForUnclosedJsxTag.js

@@ -18,4 +18,4 @@ let Foo = {
     Bar() { }
 };
 let Baz = () => { };
-let x = React.createElement(Foo.Bar, null, "Hell let y = ", React.createElement(Baz, null, "Hello"));
+let x = React.createElement(Foo.Bar, null, "Hello let y = ", React.createElement(Baz, null, "Hello"));

testdata/baselines/reference/submodule/compiler/errorSpanForUnclosedJsxTag.js.diff

@@ -7,4 +7,4 @@
 -let x = React.createElement(Foo.Bar, null,
 -    "Hello let y = ",
 -    React.createElement(Baz, null, "Hello"));
-+let x = React.createElement(Foo.Bar, null, "Hell let y = ", React.createElement(Baz, null, "Hello"));
++let x = React.createElement(Foo.Bar, null, "Hello let y = ", React.createElement(Baz, null, "Hello"));

testdata/baselines/reference/submodule/compiler/jsxChildrenIndividualErrorElaborations.js

@@ -92,7 +92,7 @@ function Blah(props) {
 // Incompatible child.
 var a = React.createElement(Blah, null, x => x);
 // Blah components don't accept text as child elements
-var a = React.createElement(Blah, null, "Hello unexpected text");
+var a = React.createElement(Blah, null, "Hello unexpected text!");
 // Blah components don't accept multiple children.
 var a = React.createElement(Blah, null, x => "" + x, x => "" + x);
 function Blah2(props) {
@@ -101,7 +101,7 @@ function Blah2(props) {
 // Incompatible child.
 var a = React.createElement(Blah2, null, x => x);
 // Blah2 components don't accept text as child elements
-var a = React.createElement(Blah2, null, "Hello unexpected text");
+var a = React.createElement(Blah2, null, "Hello unexpected text!");
 // Blah2 components don't accept multiple children of the wrong type.
 var a = React.createElement(Blah2, null, x => x, x => x);
 function Blah3(props) {
@@ -110,6 +110,6 @@ function Blah3(props) {
 // Incompatible child.
 var a = React.createElement(Blah3, null, x => x);
 // Blah3 components don't accept text as child elements
-var a = React.createElement(Blah3, null, "Hello unexpected text");
+var a = React.createElement(Blah3, null, "Hello unexpected text!");
 // Blah3 components don't accept multiple children of the wrong type.
 var a = React.createElement(Blah3, null, x => x, x => x);

testdata/baselines/reference/submodule/compiler/jsxChildrenIndividualErrorElaborations.js.diff

@@ -9,11 +9,9 @@
  function Blah(props) {
      return React.createElement(React.Fragment, null);
  }
- // Incompatible child.
- var a = React.createElement(Blah, null, x => x);
+@@= skipped -9, +9 lines =@@
  // Blah components don't accept text as child elements
--var a = React.createElement(Blah, null, "Hello unexpected text!");
-+var a = React.createElement(Blah, null, "Hello unexpected text");
+ var a = React.createElement(Blah, null, "Hello unexpected text!");
  // Blah components don't accept multiple children.
 -var a = React.createElement(Blah, null,
 -    x => "" + x,
@@ -22,11 +20,9 @@
  function Blah2(props) {
      return React.createElement(React.Fragment, null);
  }
- // Incompatible child.
- var a = React.createElement(Blah2, null, x => x);
+@@= skipped -11, +9 lines =@@
  // Blah2 components don't accept text as child elements
--var a = React.createElement(Blah2, null, "Hello unexpected text!");
-+var a = React.createElement(Blah2, null, "Hello unexpected text");
+ var a = React.createElement(Blah2, null, "Hello unexpected text!");
  // Blah2 components don't accept multiple children of the wrong type.
 -var a = React.createElement(Blah2, null,
 -    x => x,
@@ -35,11 +31,9 @@
  function Blah3(props) {
      return React.createElement(React.Fragment, null);
  }
- // Incompatible child.
- var a = React.createElement(Blah3, null, x => x);
+@@= skipped -11, +9 lines =@@
  // Blah3 components don't accept text as child elements
--var a = React.createElement(Blah3, null, "Hello unexpected text!");
-+var a = React.createElement(Blah3, null, "Hello unexpected text");
+ var a = React.createElement(Blah3, null, "Hello unexpected text!");
  // Blah3 components don't accept multiple children of the wrong type.
 -var a = React.createElement(Blah3, null,
 -    x => x,

testdata/baselines/reference/submodule/conformance/jsDeclarationsReactComponents.js

@@ -125,7 +125,7 @@ const react_1 = __importDefault(require("react"));
  * @type {React.SFC}
  */
 const TabbedShowLayout = () => {
-    return (react_1.default.createElement("div", { className: "", key: "" }, "o"));
+    return (react_1.default.createElement("div", { className: "", key: "" }, "ok"));
 };
 TabbedShowLayout.defaultProps = {
     tabs: "default value"
@@ -142,7 +142,7 @@ const react_1 = __importDefault(require("react"));
  * @type {{defaultProps: {tabs: string}} & ((props?: {elem: string}) => JSX.Element)}
  */
 const TabbedShowLayout = () => {
-    return (react_1.default.createElement("div", { className: "", key: "" }, "o"));
+    return (react_1.default.createElement("div", { className: "", key: "" }, "ok"));
 };
 TabbedShowLayout.defaultProps = {
     tabs: "default value"
@@ -156,7 +156,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = __importDefault(require("react"));
 const TabbedShowLayout = (/** @type {{className: string}}*/ prop) => {
-    return (react_1.default.createElement("div", { className: prop.className, key: "" }, "o"));
+    return (react_1.default.createElement("div", { className: prop.className, key: "" }, "ok"));
 };
 TabbedShowLayout.defaultProps = {
     tabs: "default value"

testdata/baselines/reference/submodule/conformance/jsDeclarationsReactComponents.js.diff

@@ -20,12 +20,6 @@
  /**
   * @type {React.SFC}
   */
- const TabbedShowLayout = () => {
--    return (react_1.default.createElement("div", { className: "", key: "" }, "ok"));
-+    return (react_1.default.createElement("div", { className: "", key: "" }, "o"));
- };
- TabbedShowLayout.defaultProps = {
-     tabs: "default value"
 @@= skipped -17, +17 lines =@@
      return (mod && mod.__esModule) ? mod : { "default": mod };
  };
@@ -35,24 +29,15 @@
  /**
   * @type {{defaultProps: {tabs: string}} & ((props?: {elem: string}) => JSX.Element)}
   */
- const TabbedShowLayout = () => {
--    return (react_1.default.createElement("div", { className: "", key: "" }, "ok"));
-+    return (react_1.default.createElement("div", { className: "", key: "" }, "o"));
- };
- TabbedShowLayout.defaultProps = {
-     tabs: "default value"
 @@= skipped -17, +17 lines =@@
      return (mod && mod.__esModule) ? mod : { "default": mod };
  };
  Object.defineProperty(exports, "__esModule", { value: true });
 -var react_1 = __importDefault(require("react"));
 +const react_1 = __importDefault(require("react"));
  const TabbedShowLayout = (/** @type {{className: string}}*/ prop) => {
--    return (react_1.default.createElement("div", { className: prop.className, key: "" }, "ok"));
-+    return (react_1.default.createElement("div", { className: prop.className, key: "" }, "o"));
+     return (react_1.default.createElement("div", { className: prop.className, key: "" }, "ok"));
  };
- TabbedShowLayout.defaultProps = {
-     tabs: "default value"
 @@= skipped -14, +14 lines =@@
      return (mod && mod.__esModule) ? mod : { "default": mod };
  };

testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformCustomImport(jsx=react-jsx).js

@@ -15,4 +15,4 @@ export {};
 Object.defineProperty(exports, "__esModule", { value: true });
 const jsx_runtime_1 = require("preact/jsx-runtime");
 /// <reference path="react16.d.ts" />
-const a = jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [jsx_runtime_1.jsx("p", {}), "tex", jsx_runtime_1.jsx("div", { className: "foo" })] });
+const a = jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [jsx_runtime_1.jsx("p", {}), "text", jsx_runtime_1.jsx("div", { className: "foo" })] });

testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformCustomImport(jsx=react-jsx).js.diff

@@ -8,4 +8,4 @@
 +const jsx_runtime_1 = require("preact/jsx-runtime");
  /// <reference path="react16.d.ts" />
 -const a = (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("p", {}), "text", (0, jsx_runtime_1.jsx)("div", { className: "foo" })] });
-+const a = jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [jsx_runtime_1.jsx("p", {}), "tex", jsx_runtime_1.jsx("div", { className: "foo" })] });
++const a = jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [jsx_runtime_1.jsx("p", {}), "text", jsx_runtime_1.jsx("div", { className: "foo" })] });

testdata/baselines/reference/submodule/conformance/jsxJsxsCjsTransformCustomImport(jsx=react-jsxdev).js

@@ -16,4 +16,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const jsx_dev_runtime_1 = require("preact/jsx-dev-runtime");
 const _jsxFileName = "jsxJsxsCjsTransformCustomImport.tsx";
 /// <reference path="react16.d.ts" />
-const a = jsx_dev_runtime_1.jsxDEV(jsx_dev_runtime_1.Fragment, { children: [jsx_dev_runtime_1.jsxDEV("p", {}, void 0, false, { fileName: _jsxFileName, lineNumber: 3, columnNumber: 3 }, this), "tex", jsx_dev_runtime_1.jsxDEV("div", { className: "foo" }, void 0, false, { fileName: _jsxFileName, lineNumber: 5, columnNumber: 3 }, this)] }, void 0, true, { fileName: _jsxFileName, lineNumber: 2, columnNumber: 10 }, this);
+const a = jsx_dev_runtime_1.jsxDEV(jsx_dev_runtime_1.Fragment, { children: [jsx_dev_runtime_1.jsxDEV("p", {}, void 0, false, { fileName: _jsxFileName, lineNumber: 3, columnNumber: 3 }, this), "text", jsx_dev_runtime_1.jsxDEV("div", { className: "foo" }, void 0, false, { fileName: _jsxFileName, lineNumber: 5, columnNumber: 3 }, this)] }, void 0, true, { fileName: _jsxFileName, lineNumber: 2, columnNumber: 10 }, this);