@openrewrite/rewrite 8.72.2 → 8.72.3
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/execution.js +3 -16
- package/dist/execution.js.map +1 -1
- package/dist/index.js +34 -49
- package/dist/index.js.map +1 -1
- package/dist/java/markers.js +12 -29
- package/dist/java/markers.js.map +1 -1
- package/dist/java/print.js +2 -13
- package/dist/java/print.js.map +1 -1
- package/dist/java/rpc.js +1344 -1725
- package/dist/java/rpc.js.map +1 -1
- package/dist/java/type-visitor.js +143 -184
- package/dist/java/type-visitor.js.map +1 -1
- package/dist/java/visitor.js +1072 -1249
- package/dist/java/visitor.js.map +1 -1
- package/dist/javascript/add-import.js +495 -534
- package/dist/javascript/add-import.js.map +1 -1
- package/dist/javascript/autodetect.js +116 -159
- package/dist/javascript/autodetect.js.map +1 -1
- package/dist/javascript/cleanup/add-parse-int-radix.js +41 -57
- package/dist/javascript/cleanup/add-parse-int-radix.js.map +1 -1
- package/dist/javascript/cleanup/prefer-optional-chain.js +89 -105
- package/dist/javascript/cleanup/prefer-optional-chain.js.map +1 -1
- package/dist/javascript/cleanup/use-object-property-shorthand.js +74 -95
- package/dist/javascript/cleanup/use-object-property-shorthand.js.map +1 -1
- package/dist/javascript/comparator.js +815 -1167
- package/dist/javascript/comparator.js.map +1 -1
- package/dist/javascript/dependency-workspace.js +206 -219
- package/dist/javascript/dependency-workspace.js.map +1 -1
- package/dist/javascript/format/format.js +682 -908
- package/dist/javascript/format/format.js.map +1 -1
- package/dist/javascript/format/minimum-viable-spacing-visitor.js +152 -231
- package/dist/javascript/format/minimum-viable-spacing-visitor.js.map +1 -1
- package/dist/javascript/format/normalize-whitespace-visitor.js +12 -31
- package/dist/javascript/format/normalize-whitespace-visitor.js.map +1 -1
- package/dist/javascript/format/prettier-config-loader.js +134 -153
- package/dist/javascript/format/prettier-config-loader.js.map +1 -1
- package/dist/javascript/format/prettier-format.js +112 -129
- package/dist/javascript/format/prettier-format.js.map +1 -1
- package/dist/javascript/format/tabs-and-indents-visitor.js +112 -136
- package/dist/javascript/format/tabs-and-indents-visitor.js.map +1 -1
- package/dist/javascript/markers.js +59 -92
- package/dist/javascript/markers.js.map +1 -1
- package/dist/javascript/migrate/es6/modernize-octal-escape-sequences.js +39 -52
- package/dist/javascript/migrate/es6/modernize-octal-escape-sequences.js.map +1 -1
- package/dist/javascript/migrate/es6/modernize-octal-literals.js +25 -38
- package/dist/javascript/migrate/es6/modernize-octal-literals.js.map +1 -1
- package/dist/javascript/migrate/es6/remove-duplicate-object-keys.js +66 -82
- package/dist/javascript/migrate/es6/remove-duplicate-object-keys.js.map +1 -1
- package/dist/javascript/migrate/typescript/export-assignment-to-export-default.js +10 -23
- package/dist/javascript/migrate/typescript/export-assignment-to-export-default.js.map +1 -1
- package/dist/javascript/node-resolution-result.js +137 -166
- package/dist/javascript/node-resolution-result.js.map +1 -1
- package/dist/javascript/package-json-parser.js +312 -343
- package/dist/javascript/package-json-parser.js.map +1 -1
- package/dist/javascript/package-manager.js +145 -170
- package/dist/javascript/package-manager.js.map +1 -1
- package/dist/javascript/parser.d.ts.map +1 -1
- package/dist/javascript/parser.js +94 -68
- package/dist/javascript/parser.js.map +1 -1
- package/dist/javascript/print.js +1572 -1835
- package/dist/javascript/print.js.map +1 -1
- package/dist/javascript/project-parser.js +151 -172
- package/dist/javascript/project-parser.js.map +1 -1
- package/dist/javascript/recipes/add-dependency.js +140 -175
- package/dist/javascript/recipes/add-dependency.js.map +1 -1
- package/dist/javascript/recipes/async-callback-in-sync-array-method.js +20 -36
- package/dist/javascript/recipes/async-callback-in-sync-array-method.js.map +1 -1
- package/dist/javascript/recipes/auto-format.js +3 -14
- package/dist/javascript/recipes/auto-format.js.map +1 -1
- package/dist/javascript/recipes/change-import.js +447 -495
- package/dist/javascript/recipes/change-import.js.map +1 -1
- package/dist/javascript/recipes/order-imports.js +162 -175
- package/dist/javascript/recipes/order-imports.js.map +1 -1
- package/dist/javascript/recipes/upgrade-dependency-version.js +167 -197
- package/dist/javascript/recipes/upgrade-dependency-version.js.map +1 -1
- package/dist/javascript/recipes/upgrade-transitive-dependency-version.js +166 -193
- package/dist/javascript/recipes/upgrade-transitive-dependency-version.js.map +1 -1
- package/dist/javascript/remove-import.js +689 -724
- package/dist/javascript/remove-import.js.map +1 -1
- package/dist/javascript/rpc.js +1007 -1332
- package/dist/javascript/rpc.js.map +1 -1
- package/dist/javascript/search/find-dependency.js +84 -110
- package/dist/javascript/search/find-dependency.js.map +1 -1
- package/dist/javascript/search/uses-method.js +5 -19
- package/dist/javascript/search/uses-method.js.map +1 -1
- package/dist/javascript/search/uses-type.js +9 -20
- package/dist/javascript/search/uses-type.js.map +1 -1
- package/dist/javascript/templating/comparator.js +737 -822
- package/dist/javascript/templating/comparator.js.map +1 -1
- package/dist/javascript/templating/engine.js +211 -245
- package/dist/javascript/templating/engine.js.map +1 -1
- package/dist/javascript/templating/pattern.js +169 -190
- package/dist/javascript/templating/pattern.js.map +1 -1
- package/dist/javascript/templating/placeholder-replacement.js +172 -210
- package/dist/javascript/templating/placeholder-replacement.js.map +1 -1
- package/dist/javascript/templating/rewrite.js +75 -97
- package/dist/javascript/templating/rewrite.js.map +1 -1
- package/dist/javascript/templating/template.js +69 -82
- package/dist/javascript/templating/template.js.map +1 -1
- package/dist/javascript/tree-debug.js +109 -137
- package/dist/javascript/tree-debug.js.map +1 -1
- package/dist/javascript/visitor.js +1090 -1254
- package/dist/javascript/visitor.js.map +1 -1
- package/dist/json/print.js +72 -103
- package/dist/json/print.js.map +1 -1
- package/dist/json/rpc.js +120 -181
- package/dist/json/rpc.js.map +1 -1
- package/dist/json/visitor.js +69 -100
- package/dist/json/visitor.js.map +1 -1
- package/dist/marketplace.js +20 -33
- package/dist/marketplace.js.map +1 -1
- package/dist/parse-error.js +41 -62
- package/dist/parse-error.js.map +1 -1
- package/dist/parser.js +7 -18
- package/dist/parser.js.map +1 -1
- package/dist/path-utils.js +46 -59
- package/dist/path-utils.js.map +1 -1
- package/dist/preconditions.js +30 -47
- package/dist/preconditions.js.map +1 -1
- package/dist/print.js +6 -19
- package/dist/print.js.map +1 -1
- package/dist/recipe.js +42 -73
- package/dist/recipe.js.map +1 -1
- package/dist/rpc/index.js +74 -115
- package/dist/rpc/index.js.map +1 -1
- package/dist/rpc/queue.js +71 -90
- package/dist/rpc/queue.js.map +1 -1
- package/dist/rpc/recipe.js +32 -57
- package/dist/rpc/recipe.js.map +1 -1
- package/dist/rpc/request/generate.js +4 -13
- package/dist/rpc/request/generate.js.map +1 -1
- package/dist/rpc/request/get-languages.js +2 -11
- package/dist/rpc/request/get-languages.js.map +1 -1
- package/dist/rpc/request/get-marketplace.js +9 -20
- package/dist/rpc/request/get-marketplace.js.map +1 -1
- package/dist/rpc/request/get-object.js +4 -13
- package/dist/rpc/request/get-object.js.map +1 -1
- package/dist/rpc/request/install-recipes.js +25 -36
- package/dist/rpc/request/install-recipes.js.map +1 -1
- package/dist/rpc/request/metrics.js +8 -17
- package/dist/rpc/request/metrics.js.map +1 -1
- package/dist/rpc/request/parse-project.js +36 -45
- package/dist/rpc/request/parse-project.js.map +1 -1
- package/dist/rpc/request/parse.js +5 -14
- package/dist/rpc/request/parse.js.map +1 -1
- package/dist/rpc/request/prepare-recipe.js +37 -52
- package/dist/rpc/request/prepare-recipe.js.map +1 -1
- package/dist/rpc/request/print.js +5 -14
- package/dist/rpc/request/print.js.map +1 -1
- package/dist/rpc/request/visit.js +56 -71
- package/dist/rpc/request/visit.js.map +1 -1
- package/dist/rpc/rewrite-rpc.js +70 -97
- package/dist/rpc/rewrite-rpc.js.map +1 -1
- package/dist/rpc/server.js +76 -89
- package/dist/rpc/server.js.map +1 -1
- package/dist/run.js +47 -66
- package/dist/run.js.map +1 -1
- package/dist/search/is-source-file.js +8 -19
- package/dist/search/is-source-file.js.map +1 -1
- package/dist/test/rewrite-test.js +154 -188
- package/dist/test/rewrite-test.js.map +1 -1
- package/dist/text/print.js +23 -38
- package/dist/text/print.js.map +1 -1
- package/dist/text/rpc.js +29 -44
- package/dist/text/rpc.js.map +1 -1
- package/dist/text/visitor.js +16 -33
- package/dist/text/visitor.js.map +1 -1
- package/dist/util.js +13 -24
- package/dist/util.js.map +1 -1
- package/dist/version.txt +1 -1
- package/dist/visitor.js +84 -115
- package/dist/visitor.js.map +1 -1
- package/dist/yaml/index.d.ts +2 -0
- package/dist/yaml/index.d.ts.map +1 -1
- package/dist/yaml/index.js +2 -0
- package/dist/yaml/index.js.map +1 -1
- package/dist/yaml/markers.d.ts +21 -0
- package/dist/yaml/markers.d.ts.map +1 -0
- package/dist/yaml/markers.js +37 -0
- package/dist/yaml/markers.js.map +1 -0
- package/dist/yaml/parser.d.ts.map +1 -1
- package/dist/yaml/parser.js +4 -1
- package/dist/yaml/parser.js.map +1 -1
- package/dist/yaml/print.d.ts +1 -1
- package/dist/yaml/print.d.ts.map +1 -1
- package/dist/yaml/print.js +175 -208
- package/dist/yaml/print.js.map +1 -1
- package/dist/yaml/rpc.js +154 -219
- package/dist/yaml/rpc.js.map +1 -1
- package/dist/yaml/visitor.js +78 -113
- package/dist/yaml/visitor.js.map +1 -1
- package/package.json +1 -1
- package/src/javascript/parser.ts +56 -14
- package/src/yaml/index.ts +2 -0
- package/src/yaml/markers.ts +70 -0
- package/src/yaml/parser.ts +5 -1
- package/src/yaml/print.ts +5 -2
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.MinimumViableSpacingVisitor = void 0;
|
|
13
4
|
/*
|
|
@@ -40,264 +31,194 @@ class MinimumViableSpacingVisitor extends visitor_1.JavaScriptVisitor {
|
|
|
40
31
|
super();
|
|
41
32
|
this.stopAfter = stopAfter;
|
|
42
33
|
}
|
|
43
|
-
visit(tree, p, parent) {
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
if (((_a = this.cursor) === null || _a === void 0 ? void 0 : _a.getNearestMessage("stop")) != null) {
|
|
50
|
-
return tree;
|
|
51
|
-
}
|
|
52
|
-
return _super.visit.call(this, tree, p, parent);
|
|
53
|
-
});
|
|
34
|
+
async visit(tree, p, parent) {
|
|
35
|
+
var _a;
|
|
36
|
+
if (((_a = this.cursor) === null || _a === void 0 ? void 0 : _a.getNearestMessage("stop")) != null) {
|
|
37
|
+
return tree;
|
|
38
|
+
}
|
|
39
|
+
return super.visit(tree, p, parent);
|
|
54
40
|
}
|
|
55
|
-
postVisit(tree, p) {
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
if (this.stopAfter != null && (0, tree_1.isScope)(this.stopAfter, tree)) {
|
|
62
|
-
(_a = this.cursor) === null || _a === void 0 ? void 0 : _a.root.messages.set("stop", true);
|
|
63
|
-
}
|
|
64
|
-
return _super.postVisit.call(this, tree, p);
|
|
65
|
-
});
|
|
41
|
+
async postVisit(tree, p) {
|
|
42
|
+
var _a;
|
|
43
|
+
if (this.stopAfter != null && (0, tree_1.isScope)(this.stopAfter, tree)) {
|
|
44
|
+
(_a = this.cursor) === null || _a === void 0 ? void 0 : _a.root.messages.set("stop", true);
|
|
45
|
+
}
|
|
46
|
+
return super.postVisit(tree, p);
|
|
66
47
|
}
|
|
67
|
-
visitAwait(await_, p) {
|
|
68
|
-
const
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
72
|
-
const ret = yield _super.visitAwait.call(this, await_, p);
|
|
73
|
-
return (0, mutative_1.create)(ret, draft => {
|
|
74
|
-
this.ensureSpace(draft.expression.prefix);
|
|
75
|
-
});
|
|
48
|
+
async visitAwait(await_, p) {
|
|
49
|
+
const ret = await super.visitAwait(await_, p);
|
|
50
|
+
return (0, mutative_1.create)(ret, draft => {
|
|
51
|
+
this.ensureSpace(draft.expression.prefix);
|
|
76
52
|
});
|
|
77
53
|
}
|
|
78
|
-
visitClassDeclaration(classDecl, p) {
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
let c = yield _super.visitClassDeclaration.call(this, classDecl, p);
|
|
84
|
-
let first = c.leadingAnnotations.length === 0;
|
|
85
|
-
if (c.modifiers.length > 0) {
|
|
86
|
-
if (!first && c.modifiers[0].prefix.whitespace === "") {
|
|
87
|
-
c = (0, mutative_1.create)(c, draft => {
|
|
88
|
-
this.ensureSpace(draft.modifiers[0].prefix);
|
|
89
|
-
});
|
|
90
|
-
}
|
|
91
|
-
c = (0, mutative_1.create)(c, draft => {
|
|
92
|
-
for (let i = 1; i < draft.modifiers.length; i++) {
|
|
93
|
-
this.ensureSpace(draft.modifiers[i].prefix);
|
|
94
|
-
}
|
|
95
|
-
});
|
|
96
|
-
first = false;
|
|
97
|
-
}
|
|
98
|
-
if (c.classKind.prefix.whitespace === "" && !first) {
|
|
99
|
-
c = (0, mutative_1.create)(c, draft => {
|
|
100
|
-
this.ensureSpace(draft.classKind.prefix);
|
|
101
|
-
});
|
|
102
|
-
first = false;
|
|
103
|
-
}
|
|
104
|
-
// anonymous classes have an empty name
|
|
105
|
-
if (c.name.simpleName !== "") {
|
|
106
|
-
c = (0, mutative_1.create)(c, draft => {
|
|
107
|
-
this.ensureSpace(draft.name.prefix);
|
|
108
|
-
});
|
|
109
|
-
}
|
|
110
|
-
// Note: typeParameters should NOT have space before them - they immediately follow the class name
|
|
111
|
-
// e.g., "class DataTable<Row>" not "class DataTable <Row>"
|
|
112
|
-
if (c.extends && c.extends.before.whitespace === "") {
|
|
113
|
-
c = (0, mutative_1.create)(c, draft => {
|
|
114
|
-
this.ensureSpace(draft.extends.before);
|
|
115
|
-
});
|
|
116
|
-
}
|
|
117
|
-
if (c.implements && c.implements.before.whitespace === "") {
|
|
54
|
+
async visitClassDeclaration(classDecl, p) {
|
|
55
|
+
let c = await super.visitClassDeclaration(classDecl, p);
|
|
56
|
+
let first = c.leadingAnnotations.length === 0;
|
|
57
|
+
if (c.modifiers.length > 0) {
|
|
58
|
+
if (!first && c.modifiers[0].prefix.whitespace === "") {
|
|
118
59
|
c = (0, mutative_1.create)(c, draft => {
|
|
119
|
-
this.ensureSpace(draft.
|
|
120
|
-
if (draft.implements != undefined && draft.implements.elements.length > 0) {
|
|
121
|
-
this.ensureSpace(draft.implements.elements[0].element.prefix);
|
|
122
|
-
}
|
|
60
|
+
this.ensureSpace(draft.modifiers[0].prefix);
|
|
123
61
|
});
|
|
124
62
|
}
|
|
125
63
|
c = (0, mutative_1.create)(c, draft => {
|
|
126
|
-
draft.
|
|
64
|
+
for (let i = 1; i < draft.modifiers.length; i++) {
|
|
65
|
+
this.ensureSpace(draft.modifiers[i].prefix);
|
|
66
|
+
}
|
|
67
|
+
});
|
|
68
|
+
first = false;
|
|
69
|
+
}
|
|
70
|
+
if (c.classKind.prefix.whitespace === "" && !first) {
|
|
71
|
+
c = (0, mutative_1.create)(c, draft => {
|
|
72
|
+
this.ensureSpace(draft.classKind.prefix);
|
|
73
|
+
});
|
|
74
|
+
first = false;
|
|
75
|
+
}
|
|
76
|
+
// anonymous classes have an empty name
|
|
77
|
+
if (c.name.simpleName !== "") {
|
|
78
|
+
c = (0, mutative_1.create)(c, draft => {
|
|
79
|
+
this.ensureSpace(draft.name.prefix);
|
|
80
|
+
});
|
|
81
|
+
}
|
|
82
|
+
// Note: typeParameters should NOT have space before them - they immediately follow the class name
|
|
83
|
+
// e.g., "class DataTable<Row>" not "class DataTable <Row>"
|
|
84
|
+
if (c.extends && c.extends.before.whitespace === "") {
|
|
85
|
+
c = (0, mutative_1.create)(c, draft => {
|
|
86
|
+
this.ensureSpace(draft.extends.before);
|
|
127
87
|
});
|
|
128
|
-
|
|
88
|
+
}
|
|
89
|
+
if (c.implements && c.implements.before.whitespace === "") {
|
|
90
|
+
c = (0, mutative_1.create)(c, draft => {
|
|
91
|
+
this.ensureSpace(draft.implements.before);
|
|
92
|
+
if (draft.implements != undefined && draft.implements.elements.length > 0) {
|
|
93
|
+
this.ensureSpace(draft.implements.elements[0].element.prefix);
|
|
94
|
+
}
|
|
95
|
+
});
|
|
96
|
+
}
|
|
97
|
+
c = (0, mutative_1.create)(c, draft => {
|
|
98
|
+
draft.body.prefix.whitespace = "";
|
|
129
99
|
});
|
|
100
|
+
return c;
|
|
130
101
|
}
|
|
131
|
-
visitMethodDeclaration(method, p) {
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
let m = yield _super.visitMethodDeclaration.call(this, method, p);
|
|
137
|
-
let first = m.leadingAnnotations.length === 0;
|
|
138
|
-
if (m.modifiers.length > 0) {
|
|
139
|
-
if (!first && m.modifiers[0].prefix.whitespace === "") {
|
|
140
|
-
m = (0, mutative_1.create)(m, draft => {
|
|
141
|
-
this.ensureSpace(draft.modifiers[0].prefix);
|
|
142
|
-
});
|
|
143
|
-
}
|
|
144
|
-
m = (0, mutative_1.create)(m, draft => {
|
|
145
|
-
for (let i = 1; i < draft.modifiers.length; i++) {
|
|
146
|
-
this.ensureSpace(draft.modifiers[i].prefix);
|
|
147
|
-
}
|
|
148
|
-
});
|
|
149
|
-
first = false;
|
|
150
|
-
}
|
|
151
|
-
// FunctionDeclaration marker check must come AFTER modifiers processing
|
|
152
|
-
// to avoid adding unwanted space before the first modifier (e.g., 'async')
|
|
153
|
-
if ((0, markers_1.findMarker)(method, tree_2.JS.Markers.FunctionDeclaration)) {
|
|
154
|
-
first = false;
|
|
155
|
-
}
|
|
156
|
-
if (!first && m.name.prefix.whitespace === "") {
|
|
102
|
+
async visitMethodDeclaration(method, p) {
|
|
103
|
+
let m = await super.visitMethodDeclaration(method, p);
|
|
104
|
+
let first = m.leadingAnnotations.length === 0;
|
|
105
|
+
if (m.modifiers.length > 0) {
|
|
106
|
+
if (!first && m.modifiers[0].prefix.whitespace === "") {
|
|
157
107
|
m = (0, mutative_1.create)(m, draft => {
|
|
158
|
-
this.ensureSpace(draft.
|
|
108
|
+
this.ensureSpace(draft.modifiers[0].prefix);
|
|
159
109
|
});
|
|
160
110
|
}
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
this.ensureSpace(draft.
|
|
164
|
-
});
|
|
165
|
-
}
|
|
166
|
-
return m;
|
|
167
|
-
});
|
|
168
|
-
}
|
|
169
|
-
visitNamespaceDeclaration(namespaceDeclaration, p) {
|
|
170
|
-
const _super = Object.create(null, {
|
|
171
|
-
visitNamespaceDeclaration: { get: () => super.visitNamespaceDeclaration }
|
|
172
|
-
});
|
|
173
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
174
|
-
const ret = yield _super.visitNamespaceDeclaration.call(this, namespaceDeclaration, p);
|
|
175
|
-
return (0, mutative_1.create)(ret, draft => {
|
|
176
|
-
if (draft.modifiers.length > 0) {
|
|
177
|
-
draft.keywordType.before.whitespace = " ";
|
|
111
|
+
m = (0, mutative_1.create)(m, draft => {
|
|
112
|
+
for (let i = 1; i < draft.modifiers.length; i++) {
|
|
113
|
+
this.ensureSpace(draft.modifiers[i].prefix);
|
|
178
114
|
}
|
|
179
|
-
this.ensureSpace(draft.name.element.prefix);
|
|
180
115
|
});
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
if (draft.class.kind == java_1.J.Kind.Identifier) {
|
|
192
|
-
this.ensureSpace(draft.class.prefix);
|
|
193
|
-
}
|
|
194
|
-
}
|
|
116
|
+
first = false;
|
|
117
|
+
}
|
|
118
|
+
// FunctionDeclaration marker check must come AFTER modifiers processing
|
|
119
|
+
// to avoid adding unwanted space before the first modifier (e.g., 'async')
|
|
120
|
+
if ((0, markers_1.findMarker)(method, tree_2.JS.Markers.FunctionDeclaration)) {
|
|
121
|
+
first = false;
|
|
122
|
+
}
|
|
123
|
+
if (!first && m.name.prefix.whitespace === "") {
|
|
124
|
+
m = (0, mutative_1.create)(m, draft => {
|
|
125
|
+
this.ensureSpace(draft.name.prefix);
|
|
195
126
|
});
|
|
196
|
-
}
|
|
127
|
+
}
|
|
128
|
+
if (m.throws && m.throws.before.whitespace === "") {
|
|
129
|
+
m = (0, mutative_1.create)(m, draft => {
|
|
130
|
+
this.ensureSpace(draft.throws.before);
|
|
131
|
+
});
|
|
132
|
+
}
|
|
133
|
+
return m;
|
|
197
134
|
}
|
|
198
|
-
|
|
199
|
-
const
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
const r = yield _super.visitReturn.call(this, returnNode, p);
|
|
204
|
-
if (r.expression && r.expression.prefix.whitespace === "" &&
|
|
205
|
-
!r.markers.markers.find(m => m.id === "org.openrewrite.java.marker.ImplicitReturn")) {
|
|
206
|
-
return (0, mutative_1.create)(r, draft => {
|
|
207
|
-
this.ensureSpace(draft.expression.prefix);
|
|
208
|
-
});
|
|
135
|
+
async visitNamespaceDeclaration(namespaceDeclaration, p) {
|
|
136
|
+
const ret = await super.visitNamespaceDeclaration(namespaceDeclaration, p);
|
|
137
|
+
return (0, mutative_1.create)(ret, draft => {
|
|
138
|
+
if (draft.modifiers.length > 0) {
|
|
139
|
+
draft.keywordType.before.whitespace = " ";
|
|
209
140
|
}
|
|
210
|
-
|
|
141
|
+
this.ensureSpace(draft.name.element.prefix);
|
|
211
142
|
});
|
|
212
143
|
}
|
|
213
|
-
|
|
214
|
-
const
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
return ret && (0, mutative_1.create)(ret, draft => {
|
|
220
|
-
this.ensureSpace(draft.exception.prefix);
|
|
221
|
-
});
|
|
222
|
-
});
|
|
223
|
-
}
|
|
224
|
-
visitTypeDeclaration(typeDeclaration, p) {
|
|
225
|
-
const _super = Object.create(null, {
|
|
226
|
-
visitTypeDeclaration: { get: () => super.visitTypeDeclaration }
|
|
227
|
-
});
|
|
228
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
229
|
-
const ret = yield _super.visitTypeDeclaration.call(this, typeDeclaration, p);
|
|
230
|
-
return (0, mutative_1.create)(ret, draft => {
|
|
231
|
-
if (draft.modifiers.length > 0) {
|
|
232
|
-
this.ensureSpace(draft.name.before);
|
|
144
|
+
async visitNewClass(newClass, p) {
|
|
145
|
+
const ret = await super.visitNewClass(newClass, p);
|
|
146
|
+
return (0, mutative_1.create)(ret, draft => {
|
|
147
|
+
if (draft.class) {
|
|
148
|
+
if (draft.class.kind == java_1.J.Kind.Identifier) {
|
|
149
|
+
this.ensureSpace(draft.class.prefix);
|
|
233
150
|
}
|
|
234
|
-
|
|
235
|
-
});
|
|
151
|
+
}
|
|
236
152
|
});
|
|
237
153
|
}
|
|
238
|
-
|
|
239
|
-
const
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
const ret = yield _super.visitTypeOf.call(this, typeOf, p);
|
|
244
|
-
return (0, mutative_1.create)(ret, draft => {
|
|
154
|
+
async visitReturn(returnNode, p) {
|
|
155
|
+
const r = await super.visitReturn(returnNode, p);
|
|
156
|
+
if (r.expression && r.expression.prefix.whitespace === "" &&
|
|
157
|
+
!r.markers.markers.find(m => m.id === "org.openrewrite.java.marker.ImplicitReturn")) {
|
|
158
|
+
return (0, mutative_1.create)(r, draft => {
|
|
245
159
|
this.ensureSpace(draft.expression.prefix);
|
|
246
160
|
});
|
|
247
|
-
}
|
|
161
|
+
}
|
|
162
|
+
return r;
|
|
248
163
|
}
|
|
249
|
-
|
|
250
|
-
const
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
254
|
-
const ret = yield _super.visitTypeParameter.call(this, typeParam, p);
|
|
255
|
-
return (0, mutative_1.create)(ret, draft => {
|
|
256
|
-
if (draft.bounds && draft.bounds.elements.length > 0) {
|
|
257
|
-
this.ensureSpace(draft.bounds.before);
|
|
258
|
-
this.ensureSpace(draft.bounds.elements[0].element.prefix);
|
|
259
|
-
}
|
|
260
|
-
});
|
|
164
|
+
async visitThrow(thrown, p) {
|
|
165
|
+
const ret = await super.visitThrow(thrown, p);
|
|
166
|
+
return ret && (0, mutative_1.create)(ret, draft => {
|
|
167
|
+
this.ensureSpace(draft.exception.prefix);
|
|
261
168
|
});
|
|
262
169
|
}
|
|
263
|
-
|
|
264
|
-
const
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
let ret = yield _super.visitVariableDeclarations.call(this, v, p);
|
|
269
|
-
let first = ret.leadingAnnotations.length === 0;
|
|
270
|
-
if (first && ret.modifiers.length > 0) {
|
|
271
|
-
ret = (0, mutative_1.create)(ret, draft => {
|
|
272
|
-
for (let i = 1; i < draft.modifiers.length; i++) {
|
|
273
|
-
this.ensureSpace(draft.modifiers[i].prefix);
|
|
274
|
-
}
|
|
275
|
-
});
|
|
276
|
-
first = false;
|
|
277
|
-
}
|
|
278
|
-
if (!first) {
|
|
279
|
-
ret = (0, mutative_1.create)(ret, draft => {
|
|
280
|
-
this.ensureSpace(draft.variables[0].element.prefix);
|
|
281
|
-
});
|
|
170
|
+
async visitTypeDeclaration(typeDeclaration, p) {
|
|
171
|
+
const ret = await super.visitTypeDeclaration(typeDeclaration, p);
|
|
172
|
+
return (0, mutative_1.create)(ret, draft => {
|
|
173
|
+
if (draft.modifiers.length > 0) {
|
|
174
|
+
this.ensureSpace(draft.name.before);
|
|
282
175
|
}
|
|
283
|
-
|
|
176
|
+
this.ensureSpace(draft.name.element.prefix);
|
|
284
177
|
});
|
|
285
178
|
}
|
|
286
|
-
|
|
287
|
-
const
|
|
288
|
-
|
|
179
|
+
async visitTypeOf(typeOf, p) {
|
|
180
|
+
const ret = await super.visitTypeOf(typeOf, p);
|
|
181
|
+
return (0, mutative_1.create)(ret, draft => {
|
|
182
|
+
this.ensureSpace(draft.expression.prefix);
|
|
289
183
|
});
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
184
|
+
}
|
|
185
|
+
async visitTypeParameter(typeParam, p) {
|
|
186
|
+
const ret = await super.visitTypeParameter(typeParam, p);
|
|
187
|
+
return (0, mutative_1.create)(ret, draft => {
|
|
188
|
+
if (draft.bounds && draft.bounds.elements.length > 0) {
|
|
189
|
+
this.ensureSpace(draft.bounds.before);
|
|
190
|
+
this.ensureSpace(draft.bounds.elements[0].element.prefix);
|
|
297
191
|
}
|
|
298
|
-
return c;
|
|
299
192
|
});
|
|
300
193
|
}
|
|
194
|
+
async visitVariableDeclarations(v, p) {
|
|
195
|
+
let ret = await super.visitVariableDeclarations(v, p);
|
|
196
|
+
let first = ret.leadingAnnotations.length === 0;
|
|
197
|
+
if (first && ret.modifiers.length > 0) {
|
|
198
|
+
ret = (0, mutative_1.create)(ret, draft => {
|
|
199
|
+
for (let i = 1; i < draft.modifiers.length; i++) {
|
|
200
|
+
this.ensureSpace(draft.modifiers[i].prefix);
|
|
201
|
+
}
|
|
202
|
+
});
|
|
203
|
+
first = false;
|
|
204
|
+
}
|
|
205
|
+
if (!first) {
|
|
206
|
+
ret = (0, mutative_1.create)(ret, draft => {
|
|
207
|
+
this.ensureSpace(draft.variables[0].element.prefix);
|
|
208
|
+
});
|
|
209
|
+
}
|
|
210
|
+
return ret;
|
|
211
|
+
}
|
|
212
|
+
async visitCase(caseNode, p) {
|
|
213
|
+
const c = await super.visitCase(caseNode, p);
|
|
214
|
+
if (c.guard && c.caseLabels.elements.length > 0 && c.caseLabels.elements[c.caseLabels.elements.length - 1].after.whitespace === "") {
|
|
215
|
+
return (0, mutative_1.create)(c, draft => {
|
|
216
|
+
const last = draft.caseLabels.elements.length - 1;
|
|
217
|
+
draft.caseLabels.elements[last].after.whitespace = " ";
|
|
218
|
+
});
|
|
219
|
+
}
|
|
220
|
+
return c;
|
|
221
|
+
}
|
|
301
222
|
ensureSpace(spaceDraft) {
|
|
302
223
|
if (spaceDraft.whitespace.length === 0 && spaceDraft.comments.length === 0) {
|
|
303
224
|
spaceDraft.whitespace = " ";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"minimum-viable-spacing-visitor.js","sourceRoot":"","sources":["../../../src/javascript/format/minimum-viable-spacing-visitor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"minimum-viable-spacing-visitor.js","sourceRoot":"","sources":["../../../src/javascript/format/minimum-viable-spacing-visitor.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;GAcG;AACH,wCAA6C;AAC7C,qCAA6B;AAC7B,qCAAiD;AACjD,kCAA2B;AAC3B,uCAAkD;AAClD,2CAAyC;AAEzC;;;GAGG;AACH,MAAa,2BAA+B,SAAQ,2BAAoB;IACpE,YAAoB,SAAgB;QAChC,KAAK,EAAE,CAAC;QADQ,cAAS,GAAT,SAAS,CAAO;IAEpC,CAAC;IAEQ,KAAK,CAAC,KAAK,CAAc,IAAU,EAAE,CAAI,EAAE,MAAe;;QAC/D,IAAI,CAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,iBAAiB,CAAC,MAAM,CAAC,KAAI,IAAI,EAAE,CAAC;YACjD,OAAO,IAAS,CAAC;QACrB,CAAC;QACD,OAAO,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;IACxC,CAAC;IAEQ,KAAK,CAAC,SAAS,CAAC,IAAO,EAAE,CAAI;;QAClC,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,IAAI,IAAA,cAAO,EAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC;YAC1D,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACjD,CAAC;QACD,OAAO,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACpC,CAAC;IAES,KAAK,CAAC,UAAU,CAAC,MAAgB,EAAE,CAAI;QAC7C,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAa,CAAC;QAC1D,OAAO,IAAA,iBAAO,EAAC,GAAG,EAAE,KAAK,CAAC,EAAE;YACxB,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;QAC7C,CAAC,CAAC,CAAC;IACP,CAAC;IAES,KAAK,CAAC,qBAAqB,CAAC,SAA6B,EAAE,CAAI;QACrE,IAAI,CAAC,GAAG,MAAM,KAAK,CAAC,qBAAqB,CAAC,SAAS,EAAE,CAAC,CAAuB,CAAC;QAC9E,IAAI,KAAK,GAAG,CAAC,CAAC,kBAAkB,CAAC,MAAM,KAAK,CAAC,CAAC;QAE9C,IAAI,CAAC,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,KAAK,EAAE,EAAE,CAAC;gBACpD,CAAC,GAAG,IAAA,iBAAO,EAAC,CAAC,EAAE,KAAK,CAAC,EAAE;oBACnB,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;gBAChD,CAAC,CAAC,CAAC;YACP,CAAC;YACD,CAAC,GAAG,IAAA,iBAAO,EAAC,CAAC,EAAE,KAAK,CAAC,EAAE;gBACnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;oBAC9C,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;gBAChD,CAAC;YACL,CAAC,CAAC,CAAC;YACH,KAAK,GAAG,KAAK,CAAC;QAClB,CAAC;QAED,IAAI,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC;YACjD,CAAC,GAAG,IAAA,iBAAO,EAAC,CAAC,EAAE,KAAK,CAAC,EAAE;gBACnB,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;YAC7C,CAAC,CAAC,CAAC;YACH,KAAK,GAAG,KAAK,CAAC;QAClB,CAAC;QAED,uCAAuC;QACvC,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,KAAK,EAAE,EAAE,CAAC;YAC3B,CAAC,GAAG,IAAA,iBAAO,EAAC,CAAC,EAAE,KAAK,CAAC,EAAE;gBACnB,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACxC,CAAC,CAAC,CAAC;QACP,CAAC;QAED,kGAAkG;QAClG,2DAA2D;QAE3D,IAAI,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,KAAK,EAAE,EAAE,CAAC;YAClD,CAAC,GAAG,IAAA,iBAAO,EAAC,CAAC,EAAE,KAAK,CAAC,EAAE;gBACnB,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,OAAQ,CAAC,MAAM,CAAC,CAAC;YAC5C,CAAC,CAAC,CAAC;QACP,CAAC;QAED,IAAI,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,UAAU,KAAK,EAAE,EAAE,CAAC;YACxD,CAAC,GAAG,IAAA,iBAAO,EAAC,CAAC,EAAE,KAAK,CAAC,EAAE;gBACnB,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,UAAW,CAAC,MAAM,CAAC,CAAC;gBAC3C,IAAI,KAAK,CAAC,UAAU,IAAI,SAAS,IAAI,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACxE,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBAClE,CAAC;YACL,CAAC,CAAC,CAAC;QACP,CAAC;QAED,CAAC,GAAG,IAAA,iBAAO,EAAC,CAAC,EAAE,KAAK,CAAC,EAAE;YACnB,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,GAAG,EAAE,CAAC;QACtC,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,CAAC;IACb,CAAC;IAES,KAAK,CAAC,sBAAsB,CAAC,MAA2B,EAAE,CAAI;QACpE,IAAI,CAAC,GAAG,MAAM,KAAK,CAAC,sBAAsB,CAAC,MAAM,EAAE,CAAC,CAAwB,CAAC;QAC7E,IAAI,KAAK,GAAG,CAAC,CAAC,kBAAkB,CAAC,MAAM,KAAK,CAAC,CAAC;QAE9C,IAAI,CAAC,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,KAAK,EAAE,EAAE,CAAC;gBACpD,CAAC,GAAG,IAAA,iBAAO,EAAC,CAAC,EAAE,KAAK,CAAC,EAAE;oBACnB,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;gBAChD,CAAC,CAAC,CAAC;YACP,CAAC;YACD,CAAC,GAAG,IAAA,iBAAO,EAAC,CAAC,EAAE,KAAK,CAAC,EAAE;gBACnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;oBAC9C,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;gBAChD,CAAC;YACL,CAAC,CAAC,CAAC;YACH,KAAK,GAAG,KAAK,CAAC;QAClB,CAAC;QAED,wEAAwE;QACxE,2EAA2E;QAC3E,IAAI,IAAA,oBAAU,EAAC,MAAM,EAAE,SAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE,CAAC;YACrD,KAAK,GAAG,KAAK,CAAC;QAClB,CAAC;QAED,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,EAAE,EAAE,CAAC;YAC5C,CAAC,GAAG,IAAA,iBAAO,EAAC,CAAC,EAAE,KAAK,CAAC,EAAE;gBACnB,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACxC,CAAC,CAAC,CAAC;QACP,CAAC;QAED,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,KAAK,EAAE,EAAE,CAAC;YAChD,CAAC,GAAG,IAAA,iBAAO,EAAC,CAAC,EAAE,KAAK,CAAC,EAAE;gBACnB,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,MAAO,CAAC,MAAM,CAAC,CAAC;YAC3C,CAAC,CAAC,CAAC;QACP,CAAC;QAED,OAAO,CAAC,CAAC;IACb,CAAC;IAES,KAAK,CAAC,yBAAyB,CAAC,oBAA6C,EAAE,CAAI;QACzF,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,yBAAyB,CAAC,oBAAoB,EAAE,CAAC,CAA4B,CAAC;QACtG,OAAO,IAAA,iBAAO,EAAC,GAAG,EAAE,KAAK,CAAC,EAAE;YACxB,IAAI,KAAK,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC7B,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,GAAC,GAAG,CAAC;YAC5C,CAAC;YACD,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;IACP,CAAC;IAES,KAAK,CAAC,aAAa,CAAC,QAAoB,EAAE,CAAI;QACpD,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAe,CAAC;QACjE,OAAO,IAAA,iBAAO,EAAC,GAAG,EAAE,KAAK,CAAC,EAAE;YACxB,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;gBACd,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,IAAI,QAAC,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;oBACxC,IAAI,CAAC,WAAW,CAAE,KAAK,CAAC,KAA6B,CAAC,MAAM,CAAC,CAAC;gBAClE,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAES,KAAK,CAAC,WAAW,CAAC,UAAoB,EAAE,CAAI;QAClD,MAAM,CAAC,GAAG,MAAM,KAAK,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC,CAAa,CAAC;QAC7D,IAAI,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,UAAU,KAAK,EAAE;YACrD,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,4CAA4C,CAAC,EAAE,CAAC;YACtF,OAAO,IAAA,iBAAO,EAAC,CAAC,EAAE,KAAK,CAAC,EAAE;gBACtB,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,UAAW,CAAC,MAAM,CAAC,CAAC;YAC/C,CAAC,CAAC,CAAC;QACP,CAAC;QACD,OAAO,CAAC,CAAC;IACb,CAAC;IAES,KAAK,CAAC,UAAU,CAAC,MAAe,EAAE,CAAI;QAC5C,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAY,CAAC;QACzD,OAAO,GAAG,IAAI,IAAA,iBAAO,EAAC,GAAG,EAAE,KAAK,CAAC,EAAE;YAChC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;IACP,CAAC;IAES,KAAK,CAAC,oBAAoB,CAAC,eAAmC,EAAE,CAAI;QAC1E,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,oBAAoB,CAAC,eAAe,EAAE,CAAC,CAAuB,CAAC;QACvF,OAAO,IAAA,iBAAO,EAAC,GAAG,EAAE,KAAK,CAAC,EAAE;YACxB,IAAI,KAAK,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC7B,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACxC,CAAC;YACD,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;IACP,CAAC;IAES,KAAK,CAAC,WAAW,CAAC,MAAiB,EAAE,CAAI;QAC/C,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAc,CAAC;QAC5D,OAAO,IAAA,iBAAO,EAAC,GAAG,EAAE,KAAK,CAAC,EAAE;YACxB,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;IACP,CAAC;IAES,KAAK,CAAC,kBAAkB,CAAC,SAA0B,EAAE,CAAI;QAC/D,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAAE,CAAC,CAAoB,CAAC;QAC5E,OAAO,IAAA,iBAAO,EAAC,GAAG,EAAE,KAAK,CAAC,EAAE;YACxB,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACnD,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBACtC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAC9D,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAES,KAAK,CAAC,yBAAyB,CAAC,CAAyB,EAAE,CAAI;QACrE,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,yBAAyB,CAAC,CAAC,EAAE,CAAC,CAA2B,CAAC;QAChF,IAAI,KAAK,GAAG,GAAG,CAAC,kBAAkB,CAAC,MAAM,KAAK,CAAC,CAAC;QAEhD,IAAI,KAAK,IAAI,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpC,GAAG,GAAG,IAAA,iBAAO,EAAC,GAAG,EAAE,KAAK,CAAC,EAAE;gBACvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;oBAC9C,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;gBAChD,CAAC;YACL,CAAC,CAAC,CAAC;YACH,KAAK,GAAG,KAAK,CAAC;QAClB,CAAC;QAED,IAAI,CAAC,KAAK,EAAE,CAAC;YACT,GAAG,GAAG,IAAA,iBAAO,EAAC,GAAG,EAAE,KAAK,CAAC,EAAE;gBACvB,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACxD,CAAC,CAAC,CAAC;QACP,CAAC;QAED,OAAO,GAAG,CAAC;IACf,CAAC;IAGS,KAAK,CAAC,SAAS,CAAC,QAAgB,EAAE,CAAI;QAC5C,MAAM,CAAC,GAAG,MAAM,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAW,CAAC;QAEvD,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,KAAK,EAAE,EAAE,CAAC;YACjI,OAAO,IAAA,iBAAO,EAAC,CAAC,EAAE,KAAK,CAAC,EAAE;gBACtB,MAAM,IAAI,GAAG,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;gBAClD,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,UAAU,GAAG,GAAG,CAAC;YAC3D,CAAC,CAAC,CAAC;QACP,CAAC;QAED,OAAO,CAAC,CAAC;IACb,CAAC;IAEO,WAAW,CAAC,UAA0B;QAC1C,IAAI,UAAU,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzE,UAAU,CAAC,UAAU,GAAG,GAAG,CAAC;QAChC,CAAC;IACL,CAAC;CACJ;AArOD,kEAqOC"}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.NormalizeWhitespaceVisitor = void 0;
|
|
13
4
|
/*
|
|
@@ -36,29 +27,19 @@ class NormalizeWhitespaceVisitor extends visitor_1.JavaScriptVisitor {
|
|
|
36
27
|
super();
|
|
37
28
|
this.stopAfter = stopAfter;
|
|
38
29
|
}
|
|
39
|
-
visit(tree, p, parent) {
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
if (((_a = this.cursor) === null || _a === void 0 ? void 0 : _a.getNearestMessage("stop")) != null) {
|
|
46
|
-
return tree;
|
|
47
|
-
}
|
|
48
|
-
return _super.visit.call(this, tree, p, parent);
|
|
49
|
-
});
|
|
30
|
+
async visit(tree, p, parent) {
|
|
31
|
+
var _a;
|
|
32
|
+
if (((_a = this.cursor) === null || _a === void 0 ? void 0 : _a.getNearestMessage("stop")) != null) {
|
|
33
|
+
return tree;
|
|
34
|
+
}
|
|
35
|
+
return super.visit(tree, p, parent);
|
|
50
36
|
}
|
|
51
|
-
postVisit(tree, p) {
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
if (this.stopAfter != null && (0, tree_1.isScope)(this.stopAfter, tree)) {
|
|
58
|
-
(_a = this.cursor) === null || _a === void 0 ? void 0 : _a.root.messages.set("stop", true);
|
|
59
|
-
}
|
|
60
|
-
return _super.postVisit.call(this, tree, p);
|
|
61
|
-
});
|
|
37
|
+
async postVisit(tree, p) {
|
|
38
|
+
var _a;
|
|
39
|
+
if (this.stopAfter != null && (0, tree_1.isScope)(this.stopAfter, tree)) {
|
|
40
|
+
(_a = this.cursor) === null || _a === void 0 ? void 0 : _a.root.messages.set("stop", true);
|
|
41
|
+
}
|
|
42
|
+
return super.postVisit(tree, p);
|
|
62
43
|
}
|
|
63
44
|
}
|
|
64
45
|
exports.NormalizeWhitespaceVisitor = NormalizeWhitespaceVisitor;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-whitespace-visitor.js","sourceRoot":"","sources":["../../../src/javascript/format/normalize-whitespace-visitor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"normalize-whitespace-visitor.js","sourceRoot":"","sources":["../../../src/javascript/format/normalize-whitespace-visitor.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;GAcG;AACH,wCAA6C;AAE7C,qCAAiD;AAEjD;;;GAGG;AACH,MAAa,0BAA8B,SAAQ,2BAAoB;IACnE,YAAoB,SAAgB;QAChC,KAAK,EAAE,CAAC;QADQ,cAAS,GAAT,SAAS,CAAO;IAEpC,CAAC;IAEQ,KAAK,CAAC,KAAK,CAAc,IAAU,EAAE,CAAI,EAAE,MAAe;;QAC/D,IAAI,CAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,iBAAiB,CAAC,MAAM,CAAC,KAAI,IAAI,EAAE,CAAC;YACjD,OAAO,IAAS,CAAC;QACrB,CAAC;QACD,OAAO,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;IACxC,CAAC;IAEQ,KAAK,CAAC,SAAS,CAAC,IAAO,EAAE,CAAI;;QAClC,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,IAAI,IAAA,cAAO,EAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC;YAC1D,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACjD,CAAC;QACD,OAAO,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACpC,CAAC;CACJ;AAlBD,gEAkBC"}
|