@openrewrite/rewrite 8.69.0-20251215-221808 → 8.69.0-20251216-104838
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/javascript/autodetect.d.ts +1 -0
- package/dist/javascript/autodetect.d.ts.map +1 -1
- package/dist/javascript/autodetect.js +153 -9
- package/dist/javascript/autodetect.js.map +1 -1
- package/dist/javascript/format.d.ts +1 -0
- package/dist/javascript/format.d.ts.map +1 -1
- package/dist/javascript/format.js +88 -16
- package/dist/javascript/format.js.map +1 -1
- package/dist/javascript/parser.d.ts.map +1 -1
- package/dist/javascript/parser.js +3 -1
- package/dist/javascript/parser.js.map +1 -1
- package/dist/javascript/style.d.ts +7 -0
- package/dist/javascript/style.d.ts.map +1 -1
- package/dist/javascript/style.js +11 -0
- package/dist/javascript/style.js.map +1 -1
- package/dist/version.txt +1 -1
- package/package.json +1 -1
- package/src/javascript/autodetect.ts +152 -9
- package/src/javascript/format.ts +90 -16
- package/src/javascript/parser.ts +3 -1
- package/src/javascript/style.ts +18 -0
|
@@ -26,6 +26,7 @@ export declare class Autodetect implements NamedStyles {
|
|
|
26
26
|
export declare class Detector {
|
|
27
27
|
private readonly tabsAndIndentsStats;
|
|
28
28
|
private readonly spacesStats;
|
|
29
|
+
private readonly wrappingAndBracesStats;
|
|
29
30
|
/**
|
|
30
31
|
* Sample a source file to collect formatting statistics.
|
|
31
32
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autodetect.d.ts","sourceRoot":"","sources":["../../src/javascript/autodetect.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAC,WAAW,EAAE,KAAK,EAAC,MAAM,UAAU,CAAC;AAE5C,OAAO,EAAC,UAAU,EAAC,MAAM,SAAS,CAAC;AACnC,OAAO,EAAC,EAAE,EAAC,MAAM,QAAQ,CAAC;AAG1B,OAAO,EAEH,WAAW,EAEX,mBAAmB,EACnB,sBAAsB,EAEzB,MAAM,SAAS,CAAC;AAEjB;;;;;;GAMG;AACH,qBAAa,UAAW,YAAW,WAAW;IAC1C,QAAQ,CAAC,IAAI,EAAG,oCAAoC,CAAU;IAC9D,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,2CAA2C;IACxD,QAAQ,CAAC,WAAW,mBAAmB;IACvC,QAAQ,CAAC,WAAW,oEAAoE;IACxF,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,CAAM;IAC7B,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC;gBAEb,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE;IAKvC,MAAM,CAAC,QAAQ,IAAI,QAAQ;CAG9B;AAED;;GAEG;AACH,qBAAa,QAAQ;IACjB,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAkC;IACtE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA0B;
|
|
1
|
+
{"version":3,"file":"autodetect.d.ts","sourceRoot":"","sources":["../../src/javascript/autodetect.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAC,WAAW,EAAE,KAAK,EAAC,MAAM,UAAU,CAAC;AAE5C,OAAO,EAAC,UAAU,EAAC,MAAM,SAAS,CAAC;AACnC,OAAO,EAAC,EAAE,EAAC,MAAM,QAAQ,CAAC;AAG1B,OAAO,EAEH,WAAW,EAEX,mBAAmB,EACnB,sBAAsB,EAEzB,MAAM,SAAS,CAAC;AAEjB;;;;;;GAMG;AACH,qBAAa,UAAW,YAAW,WAAW;IAC1C,QAAQ,CAAC,IAAI,EAAG,oCAAoC,CAAU;IAC9D,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,2CAA2C;IACxD,QAAQ,CAAC,WAAW,mBAAmB;IACvC,QAAQ,CAAC,WAAW,oEAAoE;IACxF,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,CAAM;IAC7B,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC;gBAEb,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE;IAKvC,MAAM,CAAC,QAAQ,IAAI,QAAQ;CAG9B;AAED;;GAEG;AACH,qBAAa,QAAQ;IACjB,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAkC;IACtE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA0B;IACtD,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAqC;IAE5E;;OAEG;IACG,MAAM,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAMnD;;OAEG;IACG,gBAAgB,CAAC,EAAE,EAAE,EAAE,CAAC,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAM7D;;OAEG;IACH,KAAK,IAAI,UAAU;IAQnB,sBAAsB,IAAI,mBAAmB;IAI7C,cAAc,IAAI,WAAW;IAI7B,yBAAyB,IAAI,sBAAsB;CAGtD"}
|
|
@@ -28,6 +28,7 @@ exports.Detector = exports.Autodetect = void 0;
|
|
|
28
28
|
const uuid_1 = require("../uuid");
|
|
29
29
|
const tree_1 = require("./tree");
|
|
30
30
|
const visitor_1 = require("./visitor");
|
|
31
|
+
const java_1 = require("../java");
|
|
31
32
|
const style_1 = require("./style");
|
|
32
33
|
/**
|
|
33
34
|
* Auto-detected styles for JavaScript/TypeScript code.
|
|
@@ -58,6 +59,7 @@ class Detector {
|
|
|
58
59
|
constructor() {
|
|
59
60
|
this.tabsAndIndentsStats = new TabsAndIndentsStatistics();
|
|
60
61
|
this.spacesStats = new SpacesStatistics();
|
|
62
|
+
this.wrappingAndBracesStats = new WrappingAndBracesStatistics();
|
|
61
63
|
}
|
|
62
64
|
/**
|
|
63
65
|
* Sample a source file to collect formatting statistics.
|
|
@@ -76,6 +78,7 @@ class Detector {
|
|
|
76
78
|
return __awaiter(this, void 0, void 0, function* () {
|
|
77
79
|
yield new FindIndentVisitor(this.tabsAndIndentsStats).visit(cu, {});
|
|
78
80
|
yield new FindSpacesVisitor(this.spacesStats).visit(cu, {});
|
|
81
|
+
yield new FindWrappingAndBracesVisitor(this.wrappingAndBracesStats).visit(cu, {});
|
|
79
82
|
});
|
|
80
83
|
}
|
|
81
84
|
/**
|
|
@@ -95,13 +98,7 @@ class Detector {
|
|
|
95
98
|
return this.spacesStats.getSpacesStyle();
|
|
96
99
|
}
|
|
97
100
|
getWrappingAndBracesStyle() {
|
|
98
|
-
return
|
|
99
|
-
kind: style_1.StyleKind.WrappingAndBracesStyle,
|
|
100
|
-
ifStatement: {
|
|
101
|
-
kind: style_1.WrappingAndBracesStyleDetailKind.WrappingAndBracesStyleIfStatement,
|
|
102
|
-
elseOnNewLine: false
|
|
103
|
-
}
|
|
104
|
-
};
|
|
101
|
+
return this.wrappingAndBracesStats.getWrappingAndBracesStyle();
|
|
105
102
|
}
|
|
106
103
|
}
|
|
107
104
|
exports.Detector = Detector;
|
|
@@ -173,19 +170,68 @@ class TabsAndIndentsStatistics {
|
|
|
173
170
|
}
|
|
174
171
|
}
|
|
175
172
|
/**
|
|
176
|
-
* Tracks spacing patterns around
|
|
173
|
+
* Tracks spacing patterns around braces and other constructs.
|
|
177
174
|
*/
|
|
178
175
|
class SpacesStatistics {
|
|
179
176
|
constructor() {
|
|
180
177
|
// Track spaces within ES6 import/export braces: { a } vs {a}
|
|
181
178
|
this.es6ImportExportBracesWithSpace = 0;
|
|
182
179
|
this.es6ImportExportBracesWithoutSpace = 0;
|
|
180
|
+
// Track spaces within object literal braces: { foo: 1 } vs {foo: 1}
|
|
181
|
+
this.objectLiteralBracesWithSpace = 0;
|
|
182
|
+
this.objectLiteralBracesWithoutSpace = 0;
|
|
183
|
+
// Track spaces within object literal type braces: { foo: string } vs {foo: string}
|
|
184
|
+
this.objectLiteralTypeBracesWithSpace = 0;
|
|
185
|
+
this.objectLiteralTypeBracesWithoutSpace = 0;
|
|
183
186
|
}
|
|
184
187
|
getSpacesStyle() {
|
|
185
188
|
// Use TypeScript defaults as base since most modern JS/TS projects use similar conventions
|
|
186
189
|
// TypeScript defaults include afterTypeReferenceColon: true which is commonly expected
|
|
187
190
|
const defaults = style_1.IntelliJ.TypeScript.spaces();
|
|
188
|
-
return Object.assign(Object.assign({}, defaults), { within: Object.assign(Object.assign({}, defaults.within), { es6ImportExportBraces: this.es6ImportExportBracesWithSpace > this.es6ImportExportBracesWithoutSpace }) });
|
|
191
|
+
return Object.assign(Object.assign({}, defaults), { within: Object.assign(Object.assign({}, defaults.within), { es6ImportExportBraces: this.es6ImportExportBracesWithSpace > this.es6ImportExportBracesWithoutSpace, objectLiteralBraces: this.objectLiteralBracesWithSpace > this.objectLiteralBracesWithoutSpace, objectLiteralTypeBraces: this.objectLiteralTypeBracesWithSpace > this.objectLiteralTypeBracesWithoutSpace }) });
|
|
192
|
+
}
|
|
193
|
+
}
|
|
194
|
+
/**
|
|
195
|
+
* Tracks wrapping and braces patterns for simple (empty) blocks and methods.
|
|
196
|
+
*/
|
|
197
|
+
class WrappingAndBracesStatistics {
|
|
198
|
+
constructor() {
|
|
199
|
+
// Track simple blocks (not method/function bodies): {} vs {\n}
|
|
200
|
+
this.simpleBlocksOnOneLine = 0;
|
|
201
|
+
this.simpleBlocksOnMultipleLines = 0;
|
|
202
|
+
// Track simple method/function bodies: {} vs {\n}
|
|
203
|
+
this.simpleMethodsOnOneLine = 0;
|
|
204
|
+
this.simpleMethodsOnMultipleLines = 0;
|
|
205
|
+
}
|
|
206
|
+
recordSimpleBlock(isOnOneLine) {
|
|
207
|
+
if (isOnOneLine) {
|
|
208
|
+
this.simpleBlocksOnOneLine++;
|
|
209
|
+
}
|
|
210
|
+
else {
|
|
211
|
+
this.simpleBlocksOnMultipleLines++;
|
|
212
|
+
}
|
|
213
|
+
}
|
|
214
|
+
recordSimpleMethod(isOnOneLine) {
|
|
215
|
+
if (isOnOneLine) {
|
|
216
|
+
this.simpleMethodsOnOneLine++;
|
|
217
|
+
}
|
|
218
|
+
else {
|
|
219
|
+
this.simpleMethodsOnMultipleLines++;
|
|
220
|
+
}
|
|
221
|
+
}
|
|
222
|
+
getWrappingAndBracesStyle() {
|
|
223
|
+
return {
|
|
224
|
+
kind: style_1.StyleKind.WrappingAndBracesStyle,
|
|
225
|
+
ifStatement: {
|
|
226
|
+
kind: style_1.WrappingAndBracesStyleDetailKind.WrappingAndBracesStyleIfStatement,
|
|
227
|
+
elseOnNewLine: false
|
|
228
|
+
},
|
|
229
|
+
keepWhenReformatting: {
|
|
230
|
+
kind: style_1.WrappingAndBracesStyleDetailKind.WrappingAndBracesStyleKeepWhenReformatting,
|
|
231
|
+
simpleBlocksInOneLine: this.simpleBlocksOnOneLine > this.simpleBlocksOnMultipleLines,
|
|
232
|
+
simpleMethodsInOneLine: this.simpleMethodsOnOneLine > this.simpleMethodsOnMultipleLines
|
|
233
|
+
}
|
|
234
|
+
};
|
|
189
235
|
}
|
|
190
236
|
}
|
|
191
237
|
// ============================================================================
|
|
@@ -299,5 +345,103 @@ class FindSpacesVisitor extends visitor_1.JavaScriptVisitor {
|
|
|
299
345
|
return _super.visitExportDeclaration.call(this, export_, p);
|
|
300
346
|
});
|
|
301
347
|
}
|
|
348
|
+
visitNewClass(newClass, p) {
|
|
349
|
+
const _super = Object.create(null, {
|
|
350
|
+
visitNewClass: { get: () => super.visitNewClass }
|
|
351
|
+
});
|
|
352
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
353
|
+
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
354
|
+
// Only handle object literals (NewClass with no class/constructor)
|
|
355
|
+
if (!newClass.class && newClass.body && newClass.body.statements.length > 0) {
|
|
356
|
+
const stmts = newClass.body.statements;
|
|
357
|
+
// Check if single-line (no newlines in any element prefix or in end)
|
|
358
|
+
const isMultiLine = stmts.some(s => { var _a, _b; return (_b = (_a = s.element.prefix) === null || _a === void 0 ? void 0 : _a.whitespace) === null || _b === void 0 ? void 0 : _b.includes('\n'); }) ||
|
|
359
|
+
((_b = (_a = newClass.body.end) === null || _a === void 0 ? void 0 : _a.whitespace) === null || _b === void 0 ? void 0 : _b.includes('\n'));
|
|
360
|
+
if (!isMultiLine) {
|
|
361
|
+
const firstElement = stmts[0];
|
|
362
|
+
const hasSpaceAfterOpenBrace = (_e = (_d = (_c = firstElement.element.prefix) === null || _c === void 0 ? void 0 : _c.whitespace) === null || _d === void 0 ? void 0 : _d.includes(' ')) !== null && _e !== void 0 ? _e : false;
|
|
363
|
+
// For object literals, the space before } is in body.end, not in last statement's after
|
|
364
|
+
const hasSpaceBeforeCloseBrace = (_h = (_g = (_f = newClass.body.end) === null || _f === void 0 ? void 0 : _f.whitespace) === null || _g === void 0 ? void 0 : _g.includes(' ')) !== null && _h !== void 0 ? _h : false;
|
|
365
|
+
if (hasSpaceAfterOpenBrace || hasSpaceBeforeCloseBrace) {
|
|
366
|
+
this.stats.objectLiteralBracesWithSpace++;
|
|
367
|
+
}
|
|
368
|
+
else {
|
|
369
|
+
this.stats.objectLiteralBracesWithoutSpace++;
|
|
370
|
+
}
|
|
371
|
+
}
|
|
372
|
+
}
|
|
373
|
+
return _super.visitNewClass.call(this, newClass, p);
|
|
374
|
+
});
|
|
375
|
+
}
|
|
376
|
+
visitTypeLiteral(typeLiteral, p) {
|
|
377
|
+
const _super = Object.create(null, {
|
|
378
|
+
visitTypeLiteral: { get: () => super.visitTypeLiteral }
|
|
379
|
+
});
|
|
380
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
381
|
+
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
382
|
+
// Check type literal braces spacing: { foo: string } vs {foo: string}
|
|
383
|
+
if (typeLiteral.members && typeLiteral.members.statements.length > 0) {
|
|
384
|
+
const stmts = typeLiteral.members.statements;
|
|
385
|
+
// Check if single-line (no newlines in any element prefix or in end)
|
|
386
|
+
const isMultiLine = stmts.some(s => { var _a, _b; return (_b = (_a = s.element.prefix) === null || _a === void 0 ? void 0 : _a.whitespace) === null || _b === void 0 ? void 0 : _b.includes('\n'); }) ||
|
|
387
|
+
((_b = (_a = typeLiteral.members.end) === null || _a === void 0 ? void 0 : _a.whitespace) === null || _b === void 0 ? void 0 : _b.includes('\n'));
|
|
388
|
+
if (!isMultiLine) {
|
|
389
|
+
const firstElement = stmts[0];
|
|
390
|
+
const hasSpaceAfterOpenBrace = (_e = (_d = (_c = firstElement.element.prefix) === null || _c === void 0 ? void 0 : _c.whitespace) === null || _d === void 0 ? void 0 : _d.includes(' ')) !== null && _e !== void 0 ? _e : false;
|
|
391
|
+
// For type literals, the space before } is in members.end, not in last statement's after
|
|
392
|
+
const hasSpaceBeforeCloseBrace = (_h = (_g = (_f = typeLiteral.members.end) === null || _f === void 0 ? void 0 : _f.whitespace) === null || _g === void 0 ? void 0 : _g.includes(' ')) !== null && _h !== void 0 ? _h : false;
|
|
393
|
+
if (hasSpaceAfterOpenBrace || hasSpaceBeforeCloseBrace) {
|
|
394
|
+
this.stats.objectLiteralTypeBracesWithSpace++;
|
|
395
|
+
}
|
|
396
|
+
else {
|
|
397
|
+
this.stats.objectLiteralTypeBracesWithoutSpace++;
|
|
398
|
+
}
|
|
399
|
+
}
|
|
400
|
+
}
|
|
401
|
+
return _super.visitTypeLiteral.call(this, typeLiteral, p);
|
|
402
|
+
});
|
|
403
|
+
}
|
|
404
|
+
}
|
|
405
|
+
/**
|
|
406
|
+
* Detects wrapping and braces patterns for simple (empty) blocks.
|
|
407
|
+
*/
|
|
408
|
+
class FindWrappingAndBracesVisitor extends visitor_1.JavaScriptVisitor {
|
|
409
|
+
constructor(stats) {
|
|
410
|
+
super();
|
|
411
|
+
this.stats = stats;
|
|
412
|
+
}
|
|
413
|
+
visitBlock(block, p) {
|
|
414
|
+
const _super = Object.create(null, {
|
|
415
|
+
visitBlock: { get: () => super.visitBlock }
|
|
416
|
+
});
|
|
417
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
418
|
+
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
419
|
+
// Check if this is a simple block (empty or contains only J.Empty)
|
|
420
|
+
const isSimple = block.statements.length === 0 ||
|
|
421
|
+
(block.statements.length === 1 && block.statements[0].element.kind === java_1.J.Kind.Empty);
|
|
422
|
+
if (isSimple) {
|
|
423
|
+
// Determine if block is on one line by checking for newlines
|
|
424
|
+
const hasNewlineInEnd = (_c = (_b = (_a = block.end) === null || _a === void 0 ? void 0 : _a.whitespace) === null || _b === void 0 ? void 0 : _b.includes('\n')) !== null && _c !== void 0 ? _c : false;
|
|
425
|
+
const hasNewlineInStatements = block.statements.length > 0 &&
|
|
426
|
+
(((_e = (_d = block.statements[0].element.prefix) === null || _d === void 0 ? void 0 : _d.whitespace) === null || _e === void 0 ? void 0 : _e.includes('\n')) ||
|
|
427
|
+
((_g = (_f = block.statements[0].after) === null || _f === void 0 ? void 0 : _f.whitespace) === null || _g === void 0 ? void 0 : _g.includes('\n')));
|
|
428
|
+
const isOnOneLine = !hasNewlineInEnd && !hasNewlineInStatements;
|
|
429
|
+
// Determine parent kind to classify as block or method
|
|
430
|
+
const parent = (_h = this.cursor.parent) === null || _h === void 0 ? void 0 : _h.value;
|
|
431
|
+
const isMethodOrFunctionBody = (parent === null || parent === void 0 ? void 0 : parent.kind) === java_1.J.Kind.Lambda ||
|
|
432
|
+
(parent === null || parent === void 0 ? void 0 : parent.kind) === java_1.J.Kind.MethodDeclaration;
|
|
433
|
+
if (isMethodOrFunctionBody) {
|
|
434
|
+
this.stats.recordSimpleMethod(isOnOneLine);
|
|
435
|
+
}
|
|
436
|
+
else {
|
|
437
|
+
// Skip object literals and type literals
|
|
438
|
+
if ((parent === null || parent === void 0 ? void 0 : parent.kind) !== java_1.J.Kind.NewClass && (parent === null || parent === void 0 ? void 0 : parent.kind) !== tree_1.JS.Kind.TypeLiteral) {
|
|
439
|
+
this.stats.recordSimpleBlock(isOnOneLine);
|
|
440
|
+
}
|
|
441
|
+
}
|
|
442
|
+
}
|
|
443
|
+
return _super.visitBlock.call(this, block, p);
|
|
444
|
+
});
|
|
445
|
+
}
|
|
302
446
|
}
|
|
303
447
|
//# sourceMappingURL=autodetect.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autodetect.js","sourceRoot":"","sources":["../../src/javascript/autodetect.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"autodetect.js","sourceRoot":"","sources":["../../src/javascript/autodetect.ts"],"names":[],"mappings":"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"}
|
|
@@ -67,6 +67,7 @@ export declare class SpacesVisitor<P> extends JavaScriptVisitor<P> {
|
|
|
67
67
|
private static isOnlySpaces;
|
|
68
68
|
private static isOnlySpacesAndNotEmpty;
|
|
69
69
|
private static isNotSingleSpace;
|
|
70
|
+
protected visitNewClass(newClass: J.NewClass, p: P): Promise<J | undefined>;
|
|
70
71
|
}
|
|
71
72
|
export declare class WrappingAndBracesVisitor<P> extends JavaScriptVisitor<P> {
|
|
72
73
|
private readonly style;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../src/javascript/format.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../src/javascript/format.ts"],"names":[],"mappings":"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"}
|
|
@@ -518,8 +518,7 @@ class SpacesVisitor extends visitor_1.JavaScriptVisitor {
|
|
|
518
518
|
});
|
|
519
519
|
return __awaiter(this, void 0, void 0, function* () {
|
|
520
520
|
const pa = yield _super.visitPropertyAssignment.call(this, propertyAssignment, p);
|
|
521
|
-
// Only adjust the space before the colon if there's an initializer (not a shorthand property)
|
|
522
|
-
// For shorthand properties like { headers }, name.after.whitespace is the space before }
|
|
521
|
+
// Only adjust the space before the colon/equals if there's an initializer (not a shorthand property)
|
|
523
522
|
if (pa.initializer) {
|
|
524
523
|
return (0, visitor_2.produceAsync)(pa, draft => {
|
|
525
524
|
draft.name.after.whitespace = this.style.other.beforePropertyNameValueSeparator ? " " : "";
|
|
@@ -620,14 +619,18 @@ class SpacesVisitor extends visitor_1.JavaScriptVisitor {
|
|
|
620
619
|
return __awaiter(this, void 0, void 0, function* () {
|
|
621
620
|
const ret = yield _super.visitTypeLiteral.call(this, typeLiteral, p);
|
|
622
621
|
// Apply objectLiteralTypeBraces spacing for single-line type literals
|
|
623
|
-
|
|
624
|
-
ret.members.statements
|
|
625
|
-
|
|
626
|
-
|
|
627
|
-
|
|
628
|
-
|
|
629
|
-
|
|
630
|
-
|
|
622
|
+
if (ret.members && ret.members.statements.length > 0) {
|
|
623
|
+
const stmts = ret.members.statements;
|
|
624
|
+
const isSingleLine = !ret.members.end.whitespace.includes("\n") &&
|
|
625
|
+
stmts.every(s => !s.element.prefix.whitespace.includes("\n"));
|
|
626
|
+
if (isSingleLine) {
|
|
627
|
+
return (0, immer_1.produce)(ret, draft => {
|
|
628
|
+
const space = this.style.within.objectLiteralTypeBraces ? " " : "";
|
|
629
|
+
draft.members.statements[0].element.prefix.whitespace = space;
|
|
630
|
+
// For type literals, the space before } is in members.end, not in last statement's after
|
|
631
|
+
draft.members.end.whitespace = space;
|
|
632
|
+
});
|
|
633
|
+
}
|
|
631
634
|
}
|
|
632
635
|
return ret;
|
|
633
636
|
});
|
|
@@ -805,6 +808,34 @@ class SpacesVisitor extends visitor_1.JavaScriptVisitor {
|
|
|
805
808
|
static isNotSingleSpace(str) {
|
|
806
809
|
return this.isOnlySpaces(str) && str !== " ";
|
|
807
810
|
}
|
|
811
|
+
visitNewClass(newClass, p) {
|
|
812
|
+
const _super = Object.create(null, {
|
|
813
|
+
visitNewClass: { get: () => super.visitNewClass }
|
|
814
|
+
});
|
|
815
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
816
|
+
const ret = yield _super.visitNewClass.call(this, newClass, p);
|
|
817
|
+
// Only handle object literals (NewClass with no class/constructor)
|
|
818
|
+
if (ret.class) {
|
|
819
|
+
return ret;
|
|
820
|
+
}
|
|
821
|
+
// Handle object literal brace spacing: { foo: 1 } vs {foo: 1}
|
|
822
|
+
if (ret.body && ret.body.statements.length > 0) {
|
|
823
|
+
return (0, immer_1.produce)(ret, draft => {
|
|
824
|
+
const stmts = draft.body.statements;
|
|
825
|
+
// Check if this is a multi-line object literal
|
|
826
|
+
const isMultiLine = stmts.some(s => s.element.prefix.whitespace.includes("\n")) ||
|
|
827
|
+
draft.body.end.whitespace.includes("\n");
|
|
828
|
+
if (!isMultiLine) {
|
|
829
|
+
// Single-line: apply objectLiteralBraces spacing
|
|
830
|
+
const space = this.style.within.objectLiteralBraces ? " " : "";
|
|
831
|
+
stmts[0].element.prefix.whitespace = space;
|
|
832
|
+
draft.body.end.whitespace = space;
|
|
833
|
+
}
|
|
834
|
+
});
|
|
835
|
+
}
|
|
836
|
+
return ret;
|
|
837
|
+
});
|
|
838
|
+
}
|
|
808
839
|
}
|
|
809
840
|
exports.SpacesVisitor = SpacesVisitor;
|
|
810
841
|
class WrappingAndBracesVisitor extends visitor_1.JavaScriptVisitor {
|
|
@@ -937,12 +968,53 @@ class WrappingAndBracesVisitor extends visitor_1.JavaScriptVisitor {
|
|
|
937
968
|
const b = yield _super.visitBlock.call(this, block, p);
|
|
938
969
|
return (0, immer_1.produce)(b, draft => {
|
|
939
970
|
var _a;
|
|
940
|
-
|
|
941
|
-
|
|
942
|
-
|
|
943
|
-
|
|
944
|
-
|
|
945
|
-
|
|
971
|
+
const parentKind = (_a = this.cursor.parent) === null || _a === void 0 ? void 0 : _a.value.kind;
|
|
972
|
+
// Check if this is a "simple" block (empty or contains only a single J.Empty)
|
|
973
|
+
const isSimpleBlock = draft.statements.length === 0 ||
|
|
974
|
+
(draft.statements.length === 1 && draft.statements[0].element.kind === java_1.J.Kind.Empty);
|
|
975
|
+
// Helper to format block on one line
|
|
976
|
+
const formatOnOneLine = () => {
|
|
977
|
+
// Format as {} - remove any newlines from end whitespace
|
|
978
|
+
if (draft.end.whitespace.includes("\n")) {
|
|
979
|
+
draft.end.whitespace = draft.end.whitespace.replace(/\n\s*/g, "");
|
|
980
|
+
}
|
|
981
|
+
// Also remove newlines from statement padding if there's a J.Empty
|
|
982
|
+
if (draft.statements.length === 1) {
|
|
983
|
+
if (draft.statements[0].element.prefix.whitespace.includes("\n")) {
|
|
984
|
+
draft.statements[0].element.prefix.whitespace = "";
|
|
985
|
+
}
|
|
986
|
+
if (draft.statements[0].after.whitespace.includes("\n")) {
|
|
987
|
+
draft.statements[0].after.whitespace = "";
|
|
988
|
+
}
|
|
989
|
+
}
|
|
990
|
+
};
|
|
991
|
+
// Object literals and type literals: always format empty ones as {} on single line
|
|
992
|
+
if (parentKind === java_1.J.Kind.NewClass || parentKind === tree_1.JS.Kind.TypeLiteral) {
|
|
993
|
+
if (isSimpleBlock) {
|
|
994
|
+
formatOnOneLine();
|
|
995
|
+
}
|
|
996
|
+
return;
|
|
997
|
+
}
|
|
998
|
+
if (isSimpleBlock) {
|
|
999
|
+
// Determine which style option applies based on parent
|
|
1000
|
+
const isMethodOrFunctionBody = parentKind === java_1.J.Kind.Lambda ||
|
|
1001
|
+
parentKind === java_1.J.Kind.MethodDeclaration;
|
|
1002
|
+
const keepInOneLine = isMethodOrFunctionBody
|
|
1003
|
+
? this.style.keepWhenReformatting.simpleMethodsInOneLine
|
|
1004
|
+
: this.style.keepWhenReformatting.simpleBlocksInOneLine;
|
|
1005
|
+
if (keepInOneLine) {
|
|
1006
|
+
formatOnOneLine();
|
|
1007
|
+
}
|
|
1008
|
+
else {
|
|
1009
|
+
// Format with newline between { and }
|
|
1010
|
+
if (!draft.end.whitespace.includes("\n")) {
|
|
1011
|
+
draft.end = this.withNewlineSpace(draft.end);
|
|
1012
|
+
}
|
|
1013
|
+
}
|
|
1014
|
+
}
|
|
1015
|
+
else {
|
|
1016
|
+
// Non-simple blocks: ensure closing brace is on its own line
|
|
1017
|
+
if (!draft.end.whitespace.includes("\n") && !draft.statements[draft.statements.length - 1].after.whitespace.includes("\n")) {
|
|
946
1018
|
draft.end = this.withNewlineSpace(draft.end);
|
|
947
1019
|
}
|
|
948
1020
|
}
|