@openrewrite/rewrite 8.69.0-20251211-160325 → 8.69.0-20251211-200238

package/src/json/tree.ts

@@ -98,18 +98,170 @@ export namespace Json {
     }
 }
 
-export function space(whitespace: string): Json.Space {
-    return {
-        kind: Json.Kind.Space,
-        comments: [],
-        whitespace: whitespace
-    }
-}
+// Cache for Space objects - reuse for common whitespace patterns (flyweight pattern)
+const spaceCache = new Map<string, Json.Space>();
+const SPACE_CACHE_MAX_LENGTH = 100;
 
 export const emptySpace: Json.Space = {
     kind: Json.Kind.Space,
     comments: [],
     whitespace: ""
+};
+
+const singleSpace: Json.Space = {
+    kind: Json.Kind.Space,
+    comments: [],
+    whitespace: " "
+};
+
+/**
+ * Parse a formatting string into a Space object, extracting comments.
+ * Mirrors the Java Space.format() method.
+ */
+export function space(formatting: string): Json.Space {
+    if (formatting.length === 0) {
+        return emptySpace;
+    }
+    if (formatting === " ") {
+        return singleSpace;
+    }
+
+    // Check cache first for short strings
+    const cacheable = formatting.length <= SPACE_CACHE_MAX_LENGTH;
+    if (cacheable) {
+        const cached = spaceCache.get(formatting);
+        if (cached !== undefined) {
+            return cached;
+        }
+    }
+
+    // No comment markers means simple whitespace-only Space
+    if (!formatting.includes('/')) {
+        const result: Json.Space = {
+            kind: Json.Kind.Space,
+            comments: [],
+            whitespace: formatting
+        };
+        if (cacheable) {
+            spaceCache.set(formatting, result);
+        }
+        return result;
+    }
+
+    // Parse comments out of the formatting string
+    let prefix = '';
+    let comment = '';
+    const comments: Json.Comment[] = [];
+
+    let inSingleLineComment = false;
+    let inMultiLineComment = false;
+    let last = '';
+
+    for (let i = 0; i < formatting.length; i++) {
+        const c = formatting[i];
+
+        if (c === '/') {
+            if (inSingleLineComment) {
+                comment += c;
+            } else if (last === '/' && !inMultiLineComment) {
+                // Start of single-line comment
+                inSingleLineComment = true;
+                comment = '';
+                prefix = prefix.slice(0, -1); // Remove the first '/'
+            } else if (last === '*' && inMultiLineComment && comment.length > 0) {
+                // End of multi-line comment
+                inMultiLineComment = false;
+                comment = comment.slice(0, -1); // Trim the last '*'
+                comments.push({
+                    kind: Json.Kind.Comment,
+                    multiline: true,
+                    text: comment,
+                    suffix: prefix.slice(0, -1),
+                    markers: emptyMarkers
+                });
+                prefix = '';
+                comment = '';
+                continue;
+            } else if (inMultiLineComment) {
+                comment += c;
+            } else {
+                prefix += c;
+            }
+        } else if (c === '\r' || c === '\n') {
+            if (inSingleLineComment) {
+                // End of single-line comment
+                inSingleLineComment = false;
+                comments.push({
+                    kind: Json.Kind.Comment,
+                    multiline: false,
+                    text: comment,
+                    suffix: prefix,
+                    markers: emptyMarkers
+                });
+                prefix = c;
+                comment = '';
+            } else if (!inMultiLineComment) {
+                prefix += c;
+            } else {
+                comment += c;
+            }
+        } else if (c === '*') {
+            if (inSingleLineComment) {
+                comment += c;
+            } else if (last === '/' && !inMultiLineComment) {
+                // Start of multi-line comment
+                inMultiLineComment = true;
+                comment = '';
+            } else {
+                comment += c;
+            }
+        } else {
+            if (inSingleLineComment || inMultiLineComment) {
+                comment += c;
+            } else {
+                prefix += c;
+            }
+        }
+        last = c;
+    }
+
+    // If a file ends with a single-line comment there may be no terminating newline
+    if (comment.length > 0 || inSingleLineComment) {
+        comments.push({
+            kind: Json.Kind.Comment,
+            multiline: false,
+            text: comment,
+            suffix: prefix,
+            markers: emptyMarkers
+        });
+        prefix = '';
+    }
+
+    // Shift the whitespace on each comment forward to be a suffix of the comment before it,
+    // and the whitespace on the first comment to be the whitespace of the tree element.
+    // The remaining prefix is the suffix of the last comment.
+    let whitespace = prefix;
+    if (comments.length > 0) {
+        for (let i = comments.length - 1; i >= 0; i--) {
+            const c = comments[i];
+            const next = c.suffix;
+            comments[i] = {
+                ...c,
+                suffix: whitespace
+            };
+            whitespace = next;
+        }
+    }
+
+    const result: Json.Space = {
+        kind: Json.Kind.Space,
+        comments,
+        whitespace
+    };
+    if (cacheable) {
+        spaceCache.set(formatting, result);
+    }
+    return result;
 }
 
 const jsonKindValues = new Set(Object.values(Json.Kind));

package/src/print.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {Marker, MarkersKind, SearchResult} from "./markers";
+import {Marker, MarkersKind, Markup, SearchResult} from "./markers";
 import {Cursor, isSourceFile, SourceFile, Tree} from "./tree";
 import {TreeVisitor} from "./visitor";
 import {trimIndent} from "./util";
@@ -35,7 +35,11 @@ export namespace MarkerPrinter {
                 let searchResult = marker as SearchResult;
                 return commentWrapper(searchResult.description == null ? "" : "(" + searchResult.description + ")");
             } else if (marker.kind.startsWith("org.openrewrite.marker.Markup$")) {
-                return commentWrapper("(" + (marker as any).message + ")");
+                const markup = marker as Markup;
+                const content = markup.detail
+                    ? `(${markup.message}: ${markup.detail})`
+                    : `(${markup.message})`;
+                return commentWrapper(content);
             }
             return "";
         },