kopytko-formatter 1.1.5 → 1.1.7
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/src/config.d.ts.map +1 -1
- package/dist/src/config.js +28 -72
- package/dist/src/config.js.map +1 -1
- package/dist/src/cst-passes/aaThreshold.d.ts.map +1 -1
- package/dist/src/cst-passes/aaThreshold.js +1 -3
- package/dist/src/cst-passes/aaThreshold.js.map +1 -1
- package/dist/src/cst-passes/alignAssignments.d.ts.map +1 -1
- package/dist/src/cst-passes/alignAssignments.js +1 -3
- package/dist/src/cst-passes/alignAssignments.js.map +1 -1
- package/dist/src/cst-passes/blankLines.d.ts +2 -2
- package/dist/src/cst-passes/blankLines.d.ts.map +1 -1
- package/dist/src/cst-passes/blankLines.js +1 -1
- package/dist/src/cst-passes/blankLines.js.map +1 -1
- package/dist/src/cst-passes/casingPass.d.ts +1 -1
- package/dist/src/cst-passes/casingPass.d.ts.map +1 -1
- package/dist/src/cst-passes/casingPass.js +2 -20
- package/dist/src/cst-passes/casingPass.js.map +1 -1
- package/dist/src/cst-passes/commentNormalization.d.ts +1 -1
- package/dist/src/cst-passes/commentNormalization.d.ts.map +1 -1
- package/dist/src/cst-passes/commentNormalization.js +2 -2
- package/dist/src/cst-passes/commentNormalization.js.map +1 -1
- package/dist/src/cst-passes/commentWidth.d.ts.map +1 -1
- package/dist/src/cst-passes/commentWidth.js +2 -2
- package/dist/src/cst-passes/commentWidth.js.map +1 -1
- package/dist/src/cst-passes/elseOnNewLine.d.ts.map +1 -1
- package/dist/src/cst-passes/elseOnNewLine.js +1 -3
- package/dist/src/cst-passes/elseOnNewLine.js.map +1 -1
- package/dist/src/cst-passes/emptyLinesBetweenMethods.d.ts.map +1 -1
- package/dist/src/cst-passes/emptyLinesBetweenMethods.js +1 -3
- package/dist/src/cst-passes/emptyLinesBetweenMethods.js.map +1 -1
- package/dist/src/cst-passes/endKeywordStyle.d.ts +1 -1
- package/dist/src/cst-passes/endKeywordStyle.d.ts.map +1 -1
- package/dist/src/cst-passes/endKeywordStyle.js +2 -2
- package/dist/src/cst-passes/endKeywordStyle.js.map +1 -1
- package/dist/src/cst-passes/fieldAccessConsistency.d.ts.map +1 -1
- package/dist/src/cst-passes/fieldAccessConsistency.js +1 -3
- package/dist/src/cst-passes/fieldAccessConsistency.js.map +1 -1
- package/dist/src/cst-passes/functionVsSub.d.ts +1 -1
- package/dist/src/cst-passes/functionVsSub.d.ts.map +1 -1
- package/dist/src/cst-passes/functionVsSub.js +2 -2
- package/dist/src/cst-passes/functionVsSub.js.map +1 -1
- package/dist/src/cst-passes/importSorting.d.ts +1 -1
- package/dist/src/cst-passes/importSorting.d.ts.map +1 -1
- package/dist/src/cst-passes/importSorting.js +2 -2
- package/dist/src/cst-passes/importSorting.js.map +1 -1
- package/dist/src/cst-passes/indentation.d.ts +1 -1
- package/dist/src/cst-passes/indentation.d.ts.map +1 -1
- package/dist/src/cst-passes/indentation.js +1 -2
- package/dist/src/cst-passes/indentation.js.map +1 -1
- package/dist/src/cst-passes/infrastructure.d.ts +3 -2
- package/dist/src/cst-passes/infrastructure.d.ts.map +1 -1
- package/dist/src/cst-passes/infrastructure.js +9 -3
- package/dist/src/cst-passes/infrastructure.js.map +1 -1
- package/dist/src/cst-passes/lineCommentPosition.d.ts +1 -1
- package/dist/src/cst-passes/lineCommentPosition.d.ts.map +1 -1
- package/dist/src/cst-passes/lineCommentPosition.js.map +1 -1
- package/dist/src/cst-passes/mPrefixStyle.d.ts.map +1 -1
- package/dist/src/cst-passes/mPrefixStyle.js +1 -3
- package/dist/src/cst-passes/mPrefixStyle.js.map +1 -1
- package/dist/src/cst-passes/observeFieldStyle.d.ts.map +1 -1
- package/dist/src/cst-passes/observeFieldStyle.js +2 -2
- package/dist/src/cst-passes/observeFieldStyle.js.map +1 -1
- package/dist/src/cst-passes/paramAlignment.d.ts.map +1 -1
- package/dist/src/cst-passes/paramAlignment.js +1 -3
- package/dist/src/cst-passes/paramAlignment.js.map +1 -1
- package/dist/src/cst-passes/parenthesisIfCase.d.ts.map +1 -1
- package/dist/src/cst-passes/parenthesisIfCase.js +2 -2
- package/dist/src/cst-passes/parenthesisIfCase.js.map +1 -1
- package/dist/src/cst-passes/printStatementRemoval.d.ts +1 -1
- package/dist/src/cst-passes/printStatementRemoval.d.ts.map +1 -1
- package/dist/src/cst-passes/printStatementRemoval.js +2 -2
- package/dist/src/cst-passes/printStatementRemoval.js.map +1 -1
- package/dist/src/cst-passes/splitArrayOpenBracket.d.ts.map +1 -1
- package/dist/src/cst-passes/splitArrayOpenBracket.js +1 -3
- package/dist/src/cst-passes/splitArrayOpenBracket.js.map +1 -1
- package/dist/src/cst-passes/stringConcatStyle.d.ts.map +1 -1
- package/dist/src/cst-passes/stringConcatStyle.js +1 -3
- package/dist/src/cst-passes/stringConcatStyle.js.map +1 -1
- package/dist/src/cst-passes/stripCatchParens.d.ts.map +1 -1
- package/dist/src/cst-passes/stripCatchParens.js +2 -2
- package/dist/src/cst-passes/stripCatchParens.js.map +1 -1
- package/dist/src/cst-passes/thenStyle.d.ts +1 -1
- package/dist/src/cst-passes/thenStyle.d.ts.map +1 -1
- package/dist/src/cst-passes/thenStyle.js +1 -1
- package/dist/src/cst-passes/thenStyle.js.map +1 -1
- package/dist/src/cst-passes/trailingCommas.d.ts +1 -1
- package/dist/src/cst-passes/trailingCommas.d.ts.map +1 -1
- package/dist/src/cst-passes/trailingCommas.js +2 -2
- package/dist/src/cst-passes/trailingCommas.js.map +1 -1
- package/dist/src/cst-passes/trailingWhitespace.d.ts +2 -2
- package/dist/src/cst-passes/trailingWhitespace.d.ts.map +1 -1
- package/dist/src/cst-passes/trailingWhitespace.js +1 -1
- package/dist/src/cst-passes/trailingWhitespace.js.map +1 -1
- package/dist/src/cst-passes/wrapLongStrings.d.ts.map +1 -1
- package/dist/src/cst-passes/wrapLongStrings.js +1 -3
- package/dist/src/cst-passes/wrapLongStrings.js.map +1 -1
- package/dist/src/formatter.d.ts.map +1 -1
- package/dist/src/formatter.js +34 -15
- package/dist/src/formatter.js.map +1 -1
- package/package.json +2 -2
package/dist/src/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,WAAW,gBAAgB;IAE/B,+BAA+B;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,kCAAkC;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,2EAA2E;IAC3E,UAAU,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,CAAC;IACnC,6CAA6C;IAC7C,sBAAsB,EAAE,OAAO,CAAC;IAChC,2CAA2C;IAC3C,kBAAkB,EAAE,OAAO,CAAC;IAC5B,8EAA8E;IAC9E,aAAa,EAAE,MAAM,CAAC;IACtB,oFAAoF;IACpF,0BAA0B,EAAE,MAAM,CAAC;IACnC,qFAAqF;IACrF,wBAAwB,EAAE,MAAM,CAAC;IACjC,iHAAiH;IACjH,2BAA2B,EAAE,OAAO,GAAG,SAAS,GAAG,UAAU,CAAC;IAG9D,qFAAqF;IACrF,eAAe,EAAE,QAAQ,GAAG,SAAS,GAAG,UAAU,CAAC;IACnD,oFAAoF;IACpF,SAAS,EAAE,QAAQ,GAAG,OAAO,GAAG,gBAAgB,GAAG,iBAAiB,GAAG,UAAU,CAAC;IAGlF,kLAAkL;IAClL,oBAAoB,EAAE,UAAU,GAAG,KAAK,GAAG,YAAY,GAAG,UAAU,CAAC;IACrE,iGAAiG;IACjG,8BAA8B,EAAE,OAAO,CAAC;IACxC,yFAAyF;IACzF,kCAAkC,EAAE,OAAO,CAAC;IAC5C,qEAAqE;IACrE,qBAAqB,EAAE,OAAO,CAAC;IAC/B,mDAAmD;IACnD,iBAAiB,EAAE,OAAO,GAAG,QAAQ,CAAC;IACtC,kIAAkI;IAClI,mBAAmB,EAAE,QAAQ,GAAG,gBAAgB,GAAG,UAAU,CAAC;IAG9D,6EAA6E;IAC7E,aAAa,EAAE,MAAM,CAAC;IACtB,kIAAkI;IAClI,eAAe,EAAE,UAAU,GAAG,MAAM,GAAG,YAAY,CAAC;IACpD,kIAAkI;IAClI,iBAAiB,EAAE,UAAU,GAAG,MAAM,GAAG,YAAY,CAAC;IAGtD,8DAA8D;IAC9D,8BAA8B,EAAE,OAAO,CAAC;IACxC,2PAA2P;IAC3P,4BAA4B,EAAE,OAAO,GAAG,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,UAAU,CAAC;IAChF,mEAAmE;IACnE,aAAa,EAAE,OAAO,GAAG,QAAQ,GAAG,WAAW,CAAC;IAChD,iIAAiI;IACjI,eAAe,EAAE,QAAQ,GAAG,OAAO,GAAG,UAAU,CAAC;IACjD,kIAAkI;IAClI,0BAA0B,EAAE,QAAQ,GAAG,OAAO,GAAG,UAAU,CAAC;IAC5D,8FAA8F;IAC9F,qBAAqB,EAAE,OAAO,CAAC;IAC/B,2EAA2E;IAC3E,mCAAmC,EAAE,MAAM,CAAC;IAG5C,2EAA2E;IAC3E,oBAAoB,EAAE,OAAO,CAAC;IAC9B,sCAAsC;IACtC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,+BAA+B;IAC/B,YAAY,EAAE,OAAO,CAAC;IAGtB,4DAA4D;IAC5D,YAAY,EAAE,GAAG,GAAG,KAAK,GAAG,UAAU,CAAC;IACvC,mEAAmE;IACnE,uBAAuB,EAAE,OAAO,CAAC;IACjC,6CAA6C;IAC7C,YAAY,EAAE,MAAM,CAAC;IAGrB,6EAA6E;IAC7E,WAAW,EAAE,OAAO,CAAC;IACrB,kEAAkE;IAClE,0EAA0E;IAC1E,qBAAqB,EAAE,OAAO,CAAC;IAG/B,yDAAyD;IACzD,0BAA0B,EAAE,OAAO,CAAC;IACpC,iDAAiD;IACjD,4BAA4B,EAAE,OAAO,CAAC;IACtC,+GAA+G;IAC/G,qBAAqB,EAAE,QAAQ,GAAG,WAAW,GAAG,KAAK,CAAC;IACtD,4DAA4D;IAC5D,sBAAsB,EAAE,OAAO,CAAC;IAGhC,mEAAmE;IACnE,iBAAiB,EAAE,UAAU,GAAG,QAAQ,GAAG,OAAO,CAAC;IACnD,0DAA0D;IAC1D,aAAa,EAAE,OAAO,CAAC;IACvB,0DAA0D;IAC1D,cAAc,EAAE,OAAO,CAAC;IAGxB,6CAA6C;IAC7C,cAAc,EAAE,MAAM,GAAG,QAAQ,GAAG,UAAU,CAAC;IAC/C,mEAAmE;IACnE,mBAAmB,EAAE,OAAO,GAAG,QAAQ,GAAG,UAAU,CAAC;IAGrD,0IAA0I;IAC1I,iBAAiB,EAAE,eAAe,GAAG,MAAM,GAAG,UAAU,CAAC;IACzD,mHAAmH;IACnH,YAAY,EAAE,KAAK,GAAG,SAAS,GAAG,UAAU,CAAC;IAC7C,qDAAqD;IACrD,gBAAgB,EAAE,OAAO,CAAC;IAC1B,+IAA+I;IAC/I,sBAAsB,EAAE,KAAK,GAAG,QAAQ,GAAG,UAAU,CAAC;IAGtD;;yBAEqB;IACrB,YAAY,EAAE,OAAO,CAAC;CACvB;AAED,iFAAiF;AACjF,eAAO,MAAM,yBAAyB,EAAE,gBA2EvC,CAAC;AAEF,mEAAmE;AACnE,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,GAAG,SAAS,GAAG,gBAAgB,CA4BvG"}
|
package/dist/src/config.js
CHANGED
|
@@ -69,78 +69,34 @@ exports.DEFAULT_FORMATTING_CONFIG = {
|
|
|
69
69
|
};
|
|
70
70
|
/** Reads a FormattingConfig from a raw VS Code settings object. */
|
|
71
71
|
function parseFormattingConfig(cfg) {
|
|
72
|
+
const result = { ...exports.DEFAULT_FORMATTING_CONFIG };
|
|
72
73
|
if (!cfg)
|
|
73
|
-
return
|
|
74
|
-
const
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
spaceBeforeNamedFunctionParens: bool('spaceBeforeNamedFunctionParens', d.spaceBeforeNamedFunctionParens),
|
|
101
|
-
spaceBeforeAnonymousFunctionParens: bool('spaceBeforeAnonymousFunctionParens', d.spaceBeforeAnonymousFunctionParens),
|
|
102
|
-
spaceBeforeCallParens: bool('spaceBeforeCallParens', d.spaceBeforeCallParens),
|
|
103
|
-
spaceInsideParens: str('spaceInsideParens', d.spaceInsideParens),
|
|
104
|
-
paramAlignmentStyle: str('paramAlignmentStyle', d.paramAlignmentStyle),
|
|
105
|
-
maxLineLength: num('maxLineLength', d.maxLineLength),
|
|
106
|
-
wrapLongStrings: str('wrapLongStrings', d.wrapLongStrings),
|
|
107
|
-
stringConcatStyle: str('stringConcatStyle', d.stringConcatStyle),
|
|
108
|
-
associativeArrayBracketSpacing: bool('associativeArrayBracketSpacing', d.associativeArrayBracketSpacing),
|
|
109
|
-
associativeArrayCommaSpacing: str('associativeArrayCommaSpacing', d.associativeArrayCommaSpacing),
|
|
110
|
-
trailingComma: str('trailingComma', d.trailingComma),
|
|
111
|
-
arrayCommaStyle: str('arrayCommaStyle', d.arrayCommaStyle),
|
|
112
|
-
associativeArrayCommaStyle: str('associativeArrayCommaStyle', d.associativeArrayCommaStyle),
|
|
113
|
-
arraySplitOpenBracket: bool('arraySplitOpenBracket', d.arraySplitOpenBracket),
|
|
114
|
-
associativeArraySingleLineThreshold: num('associativeArraySingleLineThreshold', d.associativeArraySingleLineThreshold),
|
|
115
|
-
spaceAroundOperators: bool('spaceAroundOperators', d.spaceAroundOperators),
|
|
116
|
-
spaceAroundAssignment: bool('spaceAroundAssignment', d.spaceAroundAssignment),
|
|
117
|
-
unarySpacing: bool('unarySpacing', d.unarySpacing),
|
|
118
|
-
commentStyle: str('commentStyle', d.commentStyle),
|
|
119
|
-
spaceAfterCommentMarker: bool('spaceAfterCommentMarker', d.spaceAfterCommentMarker),
|
|
120
|
-
commentWidth: num('commentWidth', d.commentWidth),
|
|
121
|
-
sortImports: bool('sortImports', d.sortImports),
|
|
122
|
-
emptyLineAfterImports: bool('emptyLineAfterImports', d.emptyLineAfterImports),
|
|
123
|
-
emptyLineAfterFunctionOpen: bool('emptyLineAfterFunctionOpen', d.emptyLineAfterFunctionOpen),
|
|
124
|
-
emptyLineBeforeFunctionClose: bool('emptyLineBeforeFunctionClose', d.emptyLineBeforeFunctionClose),
|
|
125
|
-
emptyLineBeforeReturn: (() => {
|
|
126
|
-
const v = cfg['emptyLineBeforeReturn'];
|
|
127
|
-
if (v === 'always' || v === 'not-alone')
|
|
128
|
-
return v;
|
|
129
|
-
if (v === true)
|
|
130
|
-
return 'always';
|
|
131
|
-
return false;
|
|
132
|
-
})(),
|
|
133
|
-
emptyLineBeforeComment: bool('emptyLineBeforeComment', d.emptyLineBeforeComment),
|
|
134
|
-
parenthesisIfCase: str('parenthesisIfCase', d.parenthesisIfCase),
|
|
135
|
-
elseOnNewLine: bool('elseOnNewLine', d.elseOnNewLine),
|
|
136
|
-
forLoopSpacing: bool('forLoopSpacing', d.forLoopSpacing),
|
|
137
|
-
printStatement: str('printStatement', d.printStatement),
|
|
138
|
-
lineCommentPosition: str('lineCommentPosition', d.lineCommentPosition),
|
|
139
|
-
observeFieldStyle: str('observeFieldStyle', d.observeFieldStyle),
|
|
140
|
-
mPrefixStyle: str('mPrefixStyle', d.mPrefixStyle),
|
|
141
|
-
alignAssignments: bool('alignAssignments', d.alignAssignments),
|
|
142
|
-
fieldAccessConsistency: str('fieldAccessConsistency', d.fieldAccessConsistency),
|
|
143
|
-
verifySyntax: bool('verifySyntax', d.verifySyntax),
|
|
144
|
-
};
|
|
74
|
+
return result;
|
|
75
|
+
for (const key of Object.keys(exports.DEFAULT_FORMATTING_CONFIG)) {
|
|
76
|
+
if (key === 'emptyLineBeforeReturn')
|
|
77
|
+
continue;
|
|
78
|
+
const value = cfg[key];
|
|
79
|
+
const defaultValue = exports.DEFAULT_FORMATTING_CONFIG[key];
|
|
80
|
+
if (typeof defaultValue === 'number' && typeof value === 'number') {
|
|
81
|
+
result[key] = value;
|
|
82
|
+
}
|
|
83
|
+
else if (typeof defaultValue === 'boolean' && typeof value === 'boolean') {
|
|
84
|
+
result[key] = value;
|
|
85
|
+
}
|
|
86
|
+
else if (typeof defaultValue === 'string' && typeof value === 'string') {
|
|
87
|
+
result[key] = value;
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
const emptyLineBeforeReturn = cfg.emptyLineBeforeReturn;
|
|
91
|
+
if (emptyLineBeforeReturn === 'always' || emptyLineBeforeReturn === 'not-alone') {
|
|
92
|
+
result.emptyLineBeforeReturn = emptyLineBeforeReturn;
|
|
93
|
+
}
|
|
94
|
+
else if (emptyLineBeforeReturn === true) {
|
|
95
|
+
result.emptyLineBeforeReturn = 'always';
|
|
96
|
+
}
|
|
97
|
+
else {
|
|
98
|
+
result.emptyLineBeforeReturn = false;
|
|
99
|
+
}
|
|
100
|
+
return result;
|
|
145
101
|
}
|
|
146
102
|
//# sourceMappingURL=config.js.map
|
package/dist/src/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":";;;AAuNA,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aaThreshold.d.ts","sourceRoot":"","sources":["../../../src/cst-passes/aaThreshold.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"aaThreshold.d.ts","sourceRoot":"","sources":["../../../src/cst-passes/aaThreshold.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,KAAK,QAAQ,EAAE,CAGnG"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aaThreshold.js","sourceRoot":"","sources":["../../../src/cst-passes/aaThreshold.ts"],"names":[],"mappings":";;AAGA,
|
|
1
|
+
{"version":3,"file":"aaThreshold.js","sourceRoot":"","sources":["../../../src/cst-passes/aaThreshold.ts"],"names":[],"mappings":";;AAGA,0CAGC;AAHD,SAAgB,eAAe,CAAC,SAAiB;IAC/C,IAAI,SAAS,IAAI,CAAC;QAAE,OAAO,GAAG,EAAE,CAAC,EAAE,CAAC;IACpC,OAAO,GAAe,EAAE,CAAC,EAAE,CAAC;AAC9B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"alignAssignments.d.ts","sourceRoot":"","sources":["../../../src/cst-passes/alignAssignments.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"alignAssignments.d.ts","sourceRoot":"","sources":["../../../src/cst-passes/alignAssignments.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,KAAK,QAAQ,EAAE,CAGvG"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"alignAssignments.js","sourceRoot":"","sources":["../../../src/cst-passes/alignAssignments.ts"],"names":[],"mappings":";;AAGA,
|
|
1
|
+
{"version":3,"file":"alignAssignments.js","sourceRoot":"","sources":["../../../src/cst-passes/alignAssignments.ts"],"names":[],"mappings":";;AAGA,oDAGC;AAHD,SAAgB,oBAAoB,CAAC,OAAgB;IACnD,IAAI,CAAC,OAAO;QAAE,OAAO,GAAG,EAAE,CAAC,EAAE,CAAC;IAC9B,OAAO,GAAe,EAAE,CAAC,EAAE,CAAC;AAC9B,CAAC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
|
|
1
|
+
/**
|
|
2
2
|
* CST Pass: Blank line normalization.
|
|
3
3
|
*
|
|
4
4
|
* Controls maximum consecutive blank lines and blank lines between functions.
|
|
5
5
|
* Works by finding sequences of LineBreak trivia and trimming excess.
|
|
6
6
|
*/
|
|
7
|
-
import { SyntaxNode } from 'kopytko-brightscript-parser';
|
|
7
|
+
import type { SyntaxNode } from 'kopytko-brightscript-parser';
|
|
8
8
|
import { TextEdit } from './infrastructure';
|
|
9
9
|
interface BlankLineConfig {
|
|
10
10
|
maxEmptyLines: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blankLines.d.ts","sourceRoot":"","sources":["../../../src/cst-passes/blankLines.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"blankLines.d.ts","sourceRoot":"","sources":["../../../src/cst-passes/blankLines.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,UAAU,eAAe;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,0BAA0B,EAAE,MAAM,CAAC;CACpC;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,eAAe,GAAG,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,KAAK,QAAQ,EAAE,CA6BvG"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blankLines.js","sourceRoot":"","sources":["../../../src/cst-passes/blankLines.ts"],"names":[],"mappings":";AAAA
|
|
1
|
+
{"version":3,"file":"blankLines.js","sourceRoot":"","sources":["../../../src/cst-passes/blankLines.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAcH,sCA6BC;AAjCD;;;GAGG;AACH,SAAgB,aAAa,CAAC,MAAuB;IACnD,IAAI,MAAM,CAAC,aAAa,KAAK,CAAC,IAAI,MAAM,CAAC,0BAA0B,KAAK,CAAC;QAAE,OAAO,GAAG,EAAE,CAAC,EAAE,CAAC;IAE3F,OAAO,CAAC,KAAiB,EAAE,MAAc,EAAc,EAAE;QACvD,IAAI,MAAM,CAAC,aAAa,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAE1C,MAAM,KAAK,GAAe,EAAE,CAAC;QAC7B,MAAM,UAAU,GAAG,MAAM,CAAC,aAAa,CAAC;QAExC,sEAAsE;QACtE,kFAAkF;QAClF,MAAM,UAAU,GAAG,+BAA+B,CAAC;QACnD,IAAI,KAA6B,CAAC;QAElC,OAAO,CAAC,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;YAClD,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACzB,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;YAErD,IAAI,UAAU,GAAG,UAAU,EAAE,CAAC;gBAC5B,mCAAmC;gBACnC,MAAM,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;gBAC3D,MAAM,WAAW,GAAG,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;gBACpD,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;gBAC/C,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;YACtF,CAAC;QACH,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"casingPass.d.ts","sourceRoot":"","sources":["../../../src/cst-passes/casingPass.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"casingPass.d.ts","sourceRoot":"","sources":["../../../src/cst-passes/casingPass.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAqD,MAAM,6BAA6B,CAAC;AAE5G,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAEL,YAAY,EACb,MAAM,6BAA6B,CAAC;AAarC,wBAAgB,UAAU,CACxB,YAAY,EAAE,YAAY,EAC1B,aAAa,GAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAa,GAC7C,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,KAAK,QAAQ,EAAE,CA8BlD"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
2
|
+
/**
|
|
3
3
|
* CST Pass: Keyword and identifier casing.
|
|
4
4
|
*
|
|
5
5
|
* Applies casing normalization to keywords, builtins, and user functions.
|
|
@@ -18,7 +18,7 @@ const CALLABLE_KEYWORDS = new Set([
|
|
|
18
18
|
kopytko_brightscript_parser_1.TokenKind.GetLastRunCompileError, kopytko_brightscript_parser_1.TokenKind.GetLastRunRunTimeError,
|
|
19
19
|
]);
|
|
20
20
|
function casingPass(casingConfig, userFunctions = new Map()) {
|
|
21
|
-
return (root
|
|
21
|
+
return (root) => {
|
|
22
22
|
const edits = [];
|
|
23
23
|
function visit(node, afterDot) {
|
|
24
24
|
let afterAs = false;
|
|
@@ -162,24 +162,6 @@ function visitAAField(node, edits, config) {
|
|
|
162
162
|
}
|
|
163
163
|
}
|
|
164
164
|
}
|
|
165
|
-
/** For DotExpression: apply casing to the object but not the member after dot. */
|
|
166
|
-
function visitDotExpression(node, edits, config, userFunctions) {
|
|
167
|
-
let afterDot = false;
|
|
168
|
-
for (const child of node.children) {
|
|
169
|
-
if ((0, kopytko_brightscript_parser_1.isToken)(child)) {
|
|
170
|
-
if (!afterDot) {
|
|
171
|
-
processToken(child, false, false, node, edits, config, userFunctions);
|
|
172
|
-
}
|
|
173
|
-
afterDot = child.kind === kopytko_brightscript_parser_1.TokenKind.Dot;
|
|
174
|
-
}
|
|
175
|
-
else if ((0, kopytko_brightscript_parser_1.isNode)(child)) {
|
|
176
|
-
if (!afterDot) {
|
|
177
|
-
visitNormal(child, edits, config, userFunctions);
|
|
178
|
-
}
|
|
179
|
-
afterDot = false;
|
|
180
|
-
}
|
|
181
|
-
}
|
|
182
|
-
}
|
|
183
165
|
function visitNormal(node, edits, config, userFunctions) {
|
|
184
166
|
let afterDot = false;
|
|
185
167
|
let afterAs = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"casingPass.js","sourceRoot":"","sources":["../../../src/cst-passes/casingPass.ts"],"names":[],"mappings":";AAAA
|
|
1
|
+
{"version":3,"file":"casingPass.js","sourceRoot":"","sources":["../../../src/cst-passes/casingPass.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commentNormalization.d.ts","sourceRoot":"","sources":["../../../src/cst-passes/commentNormalization.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"commentNormalization.d.ts","sourceRoot":"","sources":["../../../src/cst-passes/commentNormalization.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,UAAU,EAA+B,MAAM,6BAA6B,CAAC;AAEtF,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,KAAK,YAAY,GAAG,GAAG,GAAG,KAAK,GAAG,UAAU,CAAC;AAE7C,UAAU,iBAAiB;IACzB,YAAY,EAAE,YAAY,CAAC;IAC3B,uBAAuB,EAAE,OAAO,CAAC;CAClC;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,iBAAiB,GAAG,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,KAAK,QAAQ,EAAE,CA6DpH"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
2
|
+
/**
|
|
3
3
|
* CST Pass: Comment normalization.
|
|
4
4
|
*
|
|
5
5
|
* - Convert between `'` and `rem` comment styles
|
|
@@ -20,7 +20,7 @@ function commentNormalizationPass(config) {
|
|
|
20
20
|
if (config.commentStyle === 'preserve' && !config.spaceAfterCommentMarker) {
|
|
21
21
|
return () => [];
|
|
22
22
|
}
|
|
23
|
-
return (root
|
|
23
|
+
return (root) => {
|
|
24
24
|
const edits = [];
|
|
25
25
|
function processTrivia(trivia) {
|
|
26
26
|
if (trivia.kind !== kopytko_brightscript_parser_1.TriviaKind.Comment && trivia.kind !== kopytko_brightscript_parser_1.TriviaKind.RemComment)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commentNormalization.js","sourceRoot":"","sources":["../../../src/cst-passes/commentNormalization.ts"],"names":[],"mappings":";AAAA
|
|
1
|
+
{"version":3,"file":"commentNormalization.js","sourceRoot":"","sources":["../../../src/cst-passes/commentNormalization.ts"],"names":[],"mappings":";AAAA;;;;;;;;;GASG;;AAiBH,4DA6DC;AA5ED,6EAAsF;AAWtF;;;GAGG;AACH,SAAgB,wBAAwB,CAAC,MAAyB;IAChE,IAAI,MAAM,CAAC,YAAY,KAAK,UAAU,IAAI,CAAC,MAAM,CAAC,uBAAuB,EAAE,CAAC;QAC1E,OAAO,GAAG,EAAE,CAAC,EAAE,CAAC;IAClB,CAAC;IAED,OAAO,CAAC,IAAgB,EAAc,EAAE;QACtC,MAAM,KAAK,GAAe,EAAE,CAAC;QAE7B,SAAS,aAAa,CAAC,MAAc;YACnC,IAAI,MAAM,CAAC,IAAI,KAAK,wCAAU,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,KAAK,wCAAU,CAAC,UAAU;gBAAE,OAAO;YAExF,mCAAmC;YACnC,IAAI,6BAA6B,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;gBAAE,OAAO;YAE5D,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,KAAK,wCAAU,CAAC,OAAO,CAAC;YACzD,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC;YAEjC,IAAI,MAAc,CAAC;YACnB,IAAI,OAAe,CAAC;YAEpB,IAAI,aAAa,EAAE,CAAC;gBAClB,MAAM,GAAG,GAAG,CAAC;gBACb,OAAO,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU;YAC7C,CAAC;iBAAM,CAAC;gBACN,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,sBAAsB;gBACzD,OAAO,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAClC,CAAC;YAED,0BAA0B;YAC1B,IAAI,YAAY,GAAG,MAAM,CAAC;YAC1B,IAAI,MAAM,CAAC,YAAY,KAAK,UAAU,EAAE,CAAC;gBACvC,YAAY,GAAG,MAAM,CAAC,YAAY,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC;YAC3D,CAAC;YAED,gDAAgD;YAChD,IAAI,aAAa,GAAG,OAAO,CAAC;YAC5B,IAAI,MAAM,CAAC,uBAAuB,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBACjG,aAAa,GAAG,GAAG,GAAG,aAAa,CAAC;YACtC,CAAC;YAED,MAAM,OAAO,GAAG,YAAY,GAAG,aAAa,CAAC;YAC7C,IAAI,OAAO,KAAK,YAAY,EAAE,CAAC;gBAC7B,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;YAC5D,CAAC;QACH,CAAC;QAED,2CAA2C;QAC3C,SAAS,aAAa,CAAC,IAAgB;YACrC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAClC,IAAI,IAAA,qCAAO,EAAC,KAAK,CAAC,EAAE,CAAC;oBACnB,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,aAAa;wBAAE,aAAa,CAAC,CAAC,CAAC,CAAC;oBACtD,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,cAAc;wBAAE,aAAa,CAAC,CAAC,CAAC,CAAC;gBACzD,CAAC;qBAAM,IAAI,IAAA,oCAAM,EAAC,KAAK,CAAC,EAAE,CAAC;oBACzB,aAAa,CAAC,KAAK,CAAC,CAAC;gBACvB,CAAC;YACH,CAAC;QACH,CAAC;QAED,aAAa,CAAC,IAAI,CAAC,CAAC;QACpB,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commentWidth.d.ts","sourceRoot":"","sources":["../../../src/cst-passes/commentWidth.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"commentWidth.d.ts","sourceRoot":"","sources":["../../../src/cst-passes/commentWidth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA+B,MAAM,6BAA6B,CAAC;AAEtF,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,KAAK,QAAQ,EAAE,CAenG"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.commentWidthPass = commentWidthPass;
|
|
4
|
-
|
|
4
|
+
const kopytko_brightscript_parser_1 = require("kopytko-brightscript-parser");
|
|
5
5
|
function commentWidthPass(maxWidth) {
|
|
6
6
|
if (maxWidth <= 0)
|
|
7
7
|
return () => [];
|
|
8
|
-
return (root
|
|
8
|
+
return (root) => {
|
|
9
9
|
const edits = [];
|
|
10
10
|
function walkTrivia(node) {
|
|
11
11
|
for (const child of node.children) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commentWidth.js","sourceRoot":"","sources":["../../../src/cst-passes/commentWidth.ts"],"names":[],"mappings":";;AAIA,4CAeC;AAnBD,
|
|
1
|
+
{"version":3,"file":"commentWidth.js","sourceRoot":"","sources":["../../../src/cst-passes/commentWidth.ts"],"names":[],"mappings":";;AAIA,4CAeC;AAnBD,6EAAsF;AAItF,SAAgB,gBAAgB,CAAC,QAAgB;IAC/C,IAAI,QAAQ,IAAI,CAAC;QAAE,OAAO,GAAG,EAAE,CAAC,EAAE,CAAC;IACnC,OAAO,CAAC,IAAgB,EAAc,EAAE;QACtC,MAAM,KAAK,GAAe,EAAE,CAAC;QAC7B,SAAS,UAAU,CAAC,IAAgB;YAClC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAClC,IAAI,IAAA,qCAAO,EAAC,KAAK,CAAC,EAAE,CAAC;oBACnB,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,aAAa;wBAAE,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;oBACxE,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,cAAc;wBAAE,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;gBAC3E,CAAC;qBAAM,IAAI,IAAA,oCAAM,EAAC,KAAK,CAAC,EAAE,CAAC;oBAAC,UAAU,CAAC,KAAK,CAAC,CAAC;gBAAC,CAAC;YAClD,CAAC;QACH,CAAC;QACD,UAAU,CAAC,IAAI,CAAC,CAAC;QACjB,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC;AACD,SAAS,cAAc,CAAC,MAAc,EAAE,KAAiB,EAAE,QAAgB;IACzE,IAAI,MAAM,CAAC,IAAI,KAAK,wCAAU,CAAC,OAAO;QAAE,OAAO;IAC/C,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,IAAI,QAAQ;QAAE,OAAO;IAC3C,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACrC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACnC,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,OAAO,GAAG,GAAG,CAAC;IAClB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,QAAQ,IAAI,OAAO,KAAK,GAAG,EAAE,CAAC;YACnE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACpB,OAAO,GAAG,IAAI,GAAG,IAAI,CAAC;QACxB,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,CAAC,OAAO,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;QAClD,CAAC;IACH,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACpB,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrB,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC9E,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"elseOnNewLine.d.ts","sourceRoot":"","sources":["../../../src/cst-passes/elseOnNewLine.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"elseOnNewLine.d.ts","sourceRoot":"","sources":["../../../src/cst-passes/elseOnNewLine.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,OAAO,GAAG,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,KAAK,QAAQ,EAAE,CAG1G"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"elseOnNewLine.js","sourceRoot":"","sources":["../../../src/cst-passes/elseOnNewLine.ts"],"names":[],"mappings":";;AAGA,
|
|
1
|
+
{"version":3,"file":"elseOnNewLine.js","sourceRoot":"","sources":["../../../src/cst-passes/elseOnNewLine.ts"],"names":[],"mappings":";;AAGA,8CAGC;AAHD,SAAgB,iBAAiB,CAAC,aAAsB;IACtD,IAAI,aAAa;QAAE,OAAO,GAAG,EAAE,CAAC,EAAE,CAAC;IACnC,OAAO,GAAe,EAAE,CAAC,EAAE,CAAC;AAC9B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"emptyLinesBetweenMethods.d.ts","sourceRoot":"","sources":["../../../src/cst-passes/emptyLinesBetweenMethods.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"emptyLinesBetweenMethods.d.ts","sourceRoot":"","sources":["../../../src/cst-passes/emptyLinesBetweenMethods.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,MAAM,GAAG,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,KAAK,QAAQ,EAAE,CAG5G"}
|
|
@@ -4,8 +4,6 @@ exports.emptyLinesBetweenMethodsPass = emptyLinesBetweenMethodsPass;
|
|
|
4
4
|
function emptyLinesBetweenMethodsPass(count) {
|
|
5
5
|
if (count <= 0)
|
|
6
6
|
return () => [];
|
|
7
|
-
return (
|
|
8
|
-
return [];
|
|
9
|
-
};
|
|
7
|
+
return () => [];
|
|
10
8
|
}
|
|
11
9
|
//# sourceMappingURL=emptyLinesBetweenMethods.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"emptyLinesBetweenMethods.js","sourceRoot":"","sources":["../../../src/cst-passes/emptyLinesBetweenMethods.ts"],"names":[],"mappings":";;AAGA,
|
|
1
|
+
{"version":3,"file":"emptyLinesBetweenMethods.js","sourceRoot":"","sources":["../../../src/cst-passes/emptyLinesBetweenMethods.ts"],"names":[],"mappings":";;AAGA,oEAGC;AAHD,SAAgB,4BAA4B,CAAC,KAAa;IACxD,IAAI,KAAK,IAAI,CAAC;QAAE,OAAO,GAAG,EAAE,CAAC,EAAE,CAAC;IAChC,OAAO,GAAe,EAAE,CAAC,EAAE,CAAC;AAC9B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"endKeywordStyle.d.ts","sourceRoot":"","sources":["../../../src/cst-passes/endKeywordStyle.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"endKeywordStyle.d.ts","sourceRoot":"","sources":["../../../src/cst-passes/endKeywordStyle.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,UAAU,EAAa,MAAM,6BAA6B,CAAC;AAEpE,OAAO,EAAE,QAAQ,EAAc,MAAM,kBAAkB,CAAC;AAgCxD;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,QAAQ,GAAG,SAAS,GAAG,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,KAAK,QAAQ,EAAE,CA2BjH"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
2
|
+
/**
|
|
3
3
|
* CST Pass: End keyword style.
|
|
4
4
|
*
|
|
5
5
|
* Converts between compact (`endif`, `endfor`) and spaced (`end if`, `end for`)
|
|
@@ -48,7 +48,7 @@ const END_KEYWORD_KINDS = new Set([
|
|
|
48
48
|
* @param style - 'spaced' converts `endif` → `end if`, 'compact' does the reverse.
|
|
49
49
|
*/
|
|
50
50
|
function endKeywordStylePass(style) {
|
|
51
|
-
return (root
|
|
51
|
+
return (root) => {
|
|
52
52
|
const edits = [];
|
|
53
53
|
(0, infrastructure_1.walkTokens)(root, (token) => {
|
|
54
54
|
if (!END_KEYWORD_KINDS.has(token.kind))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"endKeywordStyle.js","sourceRoot":"","sources":["../../../src/cst-passes/endKeywordStyle.ts"],"names":[],"mappings":";AAAA
|
|
1
|
+
{"version":3,"file":"endKeywordStyle.js","sourceRoot":"","sources":["../../../src/cst-passes/endKeywordStyle.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fieldAccessConsistency.d.ts","sourceRoot":"","sources":["../../../src/cst-passes/fieldAccessConsistency.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"fieldAccessConsistency.d.ts","sourceRoot":"","sources":["../../../src/cst-passes/fieldAccessConsistency.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,GAAG,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,KAAK,QAAQ,EAAE,CAG1G"}
|
|
@@ -4,8 +4,6 @@ exports.fieldAccessConsistencyPass = fieldAccessConsistencyPass;
|
|
|
4
4
|
function fieldAccessConsistencyPass(style) {
|
|
5
5
|
if (style === 'preserve')
|
|
6
6
|
return () => [];
|
|
7
|
-
return (
|
|
8
|
-
return [];
|
|
9
|
-
};
|
|
7
|
+
return () => [];
|
|
10
8
|
}
|
|
11
9
|
//# sourceMappingURL=fieldAccessConsistency.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fieldAccessConsistency.js","sourceRoot":"","sources":["../../../src/cst-passes/fieldAccessConsistency.ts"],"names":[],"mappings":";;AAGA,
|
|
1
|
+
{"version":3,"file":"fieldAccessConsistency.js","sourceRoot":"","sources":["../../../src/cst-passes/fieldAccessConsistency.ts"],"names":[],"mappings":";;AAGA,gEAGC;AAHD,SAAgB,0BAA0B,CAAC,KAAa;IACtD,IAAI,KAAK,KAAK,UAAU;QAAE,OAAO,GAAG,EAAE,CAAC,EAAE,CAAC;IAC1C,OAAO,GAAe,EAAE,CAAC,EAAE,CAAC;AAC9B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"functionVsSub.d.ts","sourceRoot":"","sources":["../../../src/cst-passes/functionVsSub.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"functionVsSub.d.ts","sourceRoot":"","sources":["../../../src/cst-passes/functionVsSub.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAiC,MAAM,6BAA6B,CAAC;AACxF,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,KAAK,SAAS,GAAG,UAAU,GAAG,KAAK,GAAG,UAAU,CAAC;AAEjD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,SAAS,GAAG,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,KAAK,QAAQ,EAAE,CAkBpG"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
2
|
+
/**
|
|
3
3
|
* CST Pass: Function vs Sub for void.
|
|
4
4
|
*
|
|
5
5
|
* Converts between `function`/`sub` for void procedures:
|
|
@@ -12,7 +12,7 @@ const kopytko_brightscript_parser_1 = require("kopytko-brightscript-parser");
|
|
|
12
12
|
function functionVsSubPass(style) {
|
|
13
13
|
if (style === 'preserve')
|
|
14
14
|
return () => [];
|
|
15
|
-
return (root
|
|
15
|
+
return (root) => {
|
|
16
16
|
const edits = [];
|
|
17
17
|
function visit(node) {
|
|
18
18
|
if (node.kind === kopytko_brightscript_parser_1.SyntaxKind.FunctionDeclaration || node.kind === kopytko_brightscript_parser_1.SyntaxKind.FunctionExpression) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"functionVsSub.js","sourceRoot":"","sources":["../../../src/cst-passes/functionVsSub.ts"],"names":[],"mappings":";AAAA
|
|
1
|
+
{"version":3,"file":"functionVsSub.js","sourceRoot":"","sources":["../../../src/cst-passes/functionVsSub.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"importSorting.d.ts","sourceRoot":"","sources":["../../../src/cst-passes/importSorting.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"importSorting.d.ts","sourceRoot":"","sources":["../../../src/cst-passes/importSorting.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,UAAU,EAA+B,MAAM,6BAA6B,CAAC;AAEtF,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,UAAU,gBAAgB;IACxB,WAAW,EAAE,OAAO,CAAC;IACrB,qBAAqB,EAAE,OAAO,CAAC;CAChC;AAQD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,GAAG,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,KAAK,QAAQ,EAAE,CA4F5G"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
2
|
+
/**
|
|
3
3
|
* CST Pass: Import sorting.
|
|
4
4
|
*
|
|
5
5
|
* Sorts `' @import` and `' @mock` annotations at the top of the file.
|
|
@@ -27,7 +27,7 @@ function importSortingPass(config) {
|
|
|
27
27
|
if (!config.sortImports && !config.emptyLineAfterImports) {
|
|
28
28
|
return () => [];
|
|
29
29
|
}
|
|
30
|
-
return (root
|
|
30
|
+
return (root) => {
|
|
31
31
|
// Find all import/mock comment lines at the top of the file.
|
|
32
32
|
// In our CST, these are trivia attached to the first token.
|
|
33
33
|
const firstToken = findFirstToken(root);
|