Skip to content

Fix/restore max line width #333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Perryvw merged 4 commits into from
Jan 11, 2019
Merged

Fix/restore max line width #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
32de698
Restored max line length and no trailing whitespace rule
Perryvw Jan 10, 2019
7b2733e
Fixed lines exceeding max length
Perryvw Jan 11, 2019
8a4d5c9
Fixed header showing up in tests
Perryvw Jan 11, 2019
516fe4c
Merge branch 'ts-to-lua-ast' into feature/restore-max-line-width
Perryvw Jan 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ BreakBeforeBraces: Attach
BreakBeforeInheritanceComma: false
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: true
ColumnLimit: 140
ColumnLimit: 120
ConstructorInitializerAllOnOneLineOrOnePerLine: false
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
Expand Down
14 changes: 12 additions & 2 deletions src/CommandLineParser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,12 @@ export function parseCommandLine(args: string[]): ParsedCommandLine {
const configPath = commandLine.options.project;
const configContents = fs.readFileSync(configPath).toString();
const configJson = ts.parseConfigFileTextToJson(configPath, configContents);
commandLine = ts.parseJsonConfigFileContent(configJson.config, ts.sys, path.dirname(configPath), commandLine.options);
commandLine = ts.parseJsonConfigFileContent(
configJson.config,
ts.sys,
path.dirname(configPath),
commandLine.options
);
}

// Add TSTL options from tsconfig
Expand All @@ -119,7 +124,12 @@ export function parseCommandLine(args: string[]): ParsedCommandLine {
return commandLine as ParsedCommandLine;
}

function addTSTLOptions(commandLine: ts.ParsedCommandLine, additionalArgs?: yargs.Arguments, forceOverride?: boolean): void {
function addTSTLOptions(
commandLine: ts.ParsedCommandLine,
additionalArgs?: yargs.Arguments,
forceOverride?: boolean
): void
{
additionalArgs = additionalArgs ? additionalArgs : commandLine.raw;
// Add compiler options that are ignored by TS parsers
if (additionalArgs) {
Expand Down
8 changes: 6 additions & 2 deletions src/Compiler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,13 @@ export function watchWithOptions(fileNames: string[], options: CompilerOptions):
};

if (config) {
ts.createWatchProgram(host as ts.WatchCompilerHostOfConfigFile<ts.SemanticDiagnosticsBuilderProgram>);
ts.createWatchProgram(
host as ts.WatchCompilerHostOfConfigFile<ts.SemanticDiagnosticsBuilderProgram>
);
} else {
ts.createWatchProgram(host as ts.WatchCompilerHostOfFilesAndCompilerOptions<ts.SemanticDiagnosticsBuilderProgram>);
ts.createWatchProgram(
host as ts.WatchCompilerHostOfFilesAndCompilerOptions<ts.SemanticDiagnosticsBuilderProgram>
);
}
}

Expand Down
134 changes: 108 additions & 26 deletions src/LuaAST.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,18 +79,22 @@ export enum SyntaxKind {
// TODO maybe name this PrefixUnary? not sure it makes sense to do so, because all unary ops in Lua are prefix
export type UnaryBitwiseOperator = SyntaxKind.BitwiseNotOperator;

export type UnaryOperator = SyntaxKind.NegationOperator | SyntaxKind.LengthOperator | SyntaxKind.NotOperator | UnaryBitwiseOperator;
export type UnaryOperator = SyntaxKind.NegationOperator
| SyntaxKind.LengthOperator
| SyntaxKind.NotOperator
| UnaryBitwiseOperator;

export type BinaryBitwiseOperator =
SyntaxKind.BitwiseAndOperator | SyntaxKind.BitwiseOrOperator | SyntaxKind.BitwiseExclusiveOrOperator |
SyntaxKind.BitwiseRightShiftOperator | SyntaxKind.BitwiseArithmeticRightShift | SyntaxKind.BitwiseLeftShiftOperator;
export type BinaryBitwiseOperator = SyntaxKind.BitwiseAndOperator | SyntaxKind.BitwiseOrOperator
| SyntaxKind.BitwiseExclusiveOrOperator | SyntaxKind.BitwiseRightShiftOperator
| SyntaxKind.BitwiseArithmeticRightShift | SyntaxKind.BitwiseLeftShiftOperator;

export type BinaryOperator =
SyntaxKind.AdditionOperator | SyntaxKind.SubractionOperator | SyntaxKind.MultiplicationOperator | SyntaxKind.DivisionOperator |
SyntaxKind.FloorDivisionOperator | SyntaxKind.ModuloOperator | SyntaxKind.PowerOperator | SyntaxKind.ConcatOperator |
SyntaxKind.EqualityOperator | SyntaxKind.InequalityOperator | SyntaxKind.LessThanOperator | SyntaxKind.LessEqualOperator |
SyntaxKind.GreaterThanOperator | SyntaxKind.GreaterEqualOperator | SyntaxKind.AndOperator | SyntaxKind.OrOperator |
BinaryBitwiseOperator;
SyntaxKind.AdditionOperator | SyntaxKind.SubractionOperator | SyntaxKind.MultiplicationOperator
| SyntaxKind.DivisionOperator | SyntaxKind.FloorDivisionOperator | SyntaxKind.ModuloOperator
| SyntaxKind.PowerOperator | SyntaxKind.ConcatOperator | SyntaxKind.EqualityOperator
| SyntaxKind.InequalityOperator | SyntaxKind.LessThanOperator | SyntaxKind.LessEqualOperator
| SyntaxKind.GreaterThanOperator | SyntaxKind.GreaterEqualOperator | SyntaxKind.AndOperator
| SyntaxKind.OrOperator | BinaryBitwiseOperator;

export type Operator = UnaryOperator | BinaryOperator;

Expand Down Expand Up @@ -198,7 +202,11 @@ export function createVariableDeclarationStatement(
right?: Expression | Expression[],
parent?: Node,
tsOriginal?: ts.Node): VariableDeclarationStatement {
const statement = createNode(SyntaxKind.VariableDeclarationStatement, parent, tsOriginal) as VariableDeclarationStatement;
const statement = createNode(
SyntaxKind.VariableDeclarationStatement,
parent,
tsOriginal
) as VariableDeclarationStatement;
setParent(left, statement);
if (Array.isArray(left)) {
statement.left = left;
Expand Down Expand Up @@ -258,7 +266,13 @@ export function isIfStatement(node: Node): node is IfStatement {
}

export function createIfStatement(
condtion: Expression, ifBlock: Block, elseBlock?: Block | IfStatement, parent?: Node, tsOriginal?: ts.Node): IfStatement {
condtion: Expression,
ifBlock: Block,
elseBlock?: Block | IfStatement,
parent?: Node,
tsOriginal?: ts.Node
): IfStatement
{
const statement = createNode(SyntaxKind.IfStatement, parent, tsOriginal) as IfStatement;
setParent(condtion, statement);
statement.condtion = condtion;
Expand All @@ -274,8 +288,8 @@ export interface IterationStatement extends Statement {
}

export function isIterationStatement(node: Node): node is WhileStatement {
return node.kind === SyntaxKind.WhileStatement || node.kind === SyntaxKind.RepeatStatement || node.kind === SyntaxKind.ForStatement ||
node.kind === SyntaxKind.ForInStatement;
return node.kind === SyntaxKind.WhileStatement || node.kind === SyntaxKind.RepeatStatement
|| node.kind === SyntaxKind.ForStatement || node.kind === SyntaxKind.ForInStatement;
}

export interface WhileStatement extends IterationStatement {
Expand All @@ -287,7 +301,13 @@ export function isWhileStatement(node: Node): node is WhileStatement {
return node.kind === SyntaxKind.WhileStatement;
}

export function createWhileStatement(body: Block, condtion: Expression, parent?: Node, tsOriginal?: ts.Node): WhileStatement {
export function createWhileStatement(
body: Block,
condtion: Expression,
parent?: Node,
tsOriginal?: ts.Node
): WhileStatement
{
const statement = createNode(SyntaxKind.WhileStatement, parent, tsOriginal) as WhileStatement;
setParent(body, statement);
statement.body = body;
Expand All @@ -305,7 +325,13 @@ export function isRepeatStatement(node: Node): node is RepeatStatement {
return node.kind === SyntaxKind.RepeatStatement;
}

export function createRepeatStatement(body: Block, condtion: Expression, parent?: Node, tsOriginal?: ts.Node): RepeatStatement {
export function createRepeatStatement(
body: Block,
condtion: Expression,
parent?: Node,
tsOriginal?: ts.Node
): RepeatStatement
{
const statement = createNode(SyntaxKind.RepeatStatement, parent, tsOriginal) as RepeatStatement;
setParent(body, statement);
statement.body = body;
Expand Down Expand Up @@ -410,7 +436,12 @@ export function isReturnStatement(node: Node): node is ReturnStatement {
return node.kind === SyntaxKind.ReturnStatement;
}

export function createReturnStatement(expressions?: Expression[], parent?: Node, tsOriginal?: ts.Node): ReturnStatement {
export function createReturnStatement(
expressions?: Expression[],
parent?: Node,
tsOriginal?: ts.Node
): ReturnStatement
{
const statement = createNode(SyntaxKind.ReturnStatement, parent, tsOriginal) as ReturnStatement;
setParent(expressions, statement);
statement.expressions = expressions;
Expand Down Expand Up @@ -438,7 +469,12 @@ export function isExpressionStatement(node: Node): node is ExpressionStatement {
return node.kind === SyntaxKind.ExpressionStatement;
}

export function createExpressionStatement(expressions: Expression, parent?: Node, tsOriginal?: ts.Node): ExpressionStatement {
export function createExpressionStatement(
expressions: Expression,
parent?: Node,
tsOriginal?: ts.Node
): ExpressionStatement
{
const statement = createNode(SyntaxKind.ExpressionStatement, parent, tsOriginal) as ExpressionStatement;
setParent(expressions, statement);
statement.expression = expressions;
Expand Down Expand Up @@ -548,8 +584,14 @@ export function isFunctionExpression(node: Node): node is FunctionExpression {
}

export function createFunctionExpression(
body: Block, params?: Identifier[], dots?: DotsLiteral, restParamName?: Identifier, parent?: Node, tsOriginal?: ts.Node):
FunctionExpression {
body: Block,
params?: Identifier[],
dots?: DotsLiteral,
restParamName?: Identifier,
parent?: Node,
tsOriginal?: ts.Node
): FunctionExpression
{
const expression = createNode(SyntaxKind.FunctionExpression, parent, tsOriginal) as FunctionExpression;
setParent(body, expression);
expression.body = body;
Expand All @@ -572,7 +614,13 @@ export function isTableFieldExpression(node: Node): node is TableFieldExpression
return node.kind === SyntaxKind.TableFieldExpression;
}

export function createTableFieldExpression(value: Expression, key?: Expression, parent?: Node, tsOriginal?: ts.Node): TableFieldExpression {
export function createTableFieldExpression(
value: Expression,
key?: Expression,
parent?: Node,
tsOriginal?: ts.Node
): TableFieldExpression
{
const expression = createNode(SyntaxKind.TableExpression, parent, tsOriginal) as TableFieldExpression;
setParent(value, expression);
expression.value = value;
Expand All @@ -590,7 +638,12 @@ export function isTableExpression(node: Node): node is TableExpression {
return node.kind === SyntaxKind.TableExpression;
}

export function createTableExpression(fields?: TableFieldExpression[], parent?: Node, tsOriginal?: ts.Node): TableExpression {
export function createTableExpression(
fields?: TableFieldExpression[],
parent?: Node,
tsOriginal?: ts.Node
): TableExpression
{
const expression = createNode(SyntaxKind.TableExpression, parent, tsOriginal) as TableExpression;
setParent(fields, expression);
expression.fields = fields;
Expand All @@ -607,7 +660,13 @@ export function isUnaryExpression(node: Node): node is UnaryExpression {
return node.kind === SyntaxKind.UnaryExpression;
}

export function createUnaryExpression(operand: Expression, operator: UnaryOperator, parent?: Node, tsOriginal?: ts.Node): UnaryExpression {
export function createUnaryExpression(
operand: Expression,
operator: UnaryOperator,
parent?: Node,
tsOriginal?: ts.Node
): UnaryExpression
{
const expression = createNode(SyntaxKind.UnaryExpression, parent, tsOriginal) as UnaryExpression;
setParent(operand, expression);
expression.operand = operand;
Expand All @@ -627,7 +686,13 @@ export function isBinaryExpression(node: Node): node is BinaryExpression {
}

export function createBinaryExpression(
left: Expression, right: Expression, operator: BinaryOperator, parent?: Node, tsOriginal?: ts.Node): BinaryExpression {
left: Expression,
right: Expression,
operator: BinaryOperator,
parent?: Node,
tsOriginal?: ts.Node
): BinaryExpression
{
const expression = createNode(SyntaxKind.BinaryExpression, parent, tsOriginal) as BinaryExpression;
setParent(left, expression);
expression.left = left;
Expand All @@ -646,7 +711,12 @@ export function isParenthesizedExpression(node: Node): node is ParenthesizedExpr
return node.kind === SyntaxKind.ParenthesizedExpression;
}

export function createParenthesizedExpression(innerExpression: Expression, parent?: Node, tsOriginal?: ts.Node): ParenthesizedExpression {
export function createParenthesizedExpression(
innerExpression: Expression,
parent?: Node,
tsOriginal?: ts.Node
): ParenthesizedExpression
{
const expression = createNode(SyntaxKind.ParenthesizedExpression, parent, tsOriginal) as ParenthesizedExpression;
setParent(innerExpression, expression);
expression.innerEpxression = innerExpression;
Expand All @@ -663,7 +733,13 @@ export function isCallExpression(node: Node): node is CallExpression {
return node.kind === SyntaxKind.CallExpression;
}

export function createCallExpression(expression: Expression, params?: Expression[], parent?: Node, tsOriginal?: ts.Node): CallExpression {
export function createCallExpression(
expression: Expression,
params?: Expression[],
parent?: Node,
tsOriginal?: ts.Node
): CallExpression
{
const callExpression = createNode(SyntaxKind.CallExpression, parent, tsOriginal) as CallExpression;
setParent(expression, callExpression);
callExpression.expression = expression;
Expand All @@ -684,7 +760,13 @@ export function isMethodCallExpression(node: Node): node is MethodCallExpression
}

export function createMethodCallExpression(
prefixExpression: Expression, name: Identifier, params?: Expression[], parent?: Node, tsOriginal?: ts.Node): MethodCallExpression {
prefixExpression: Expression,
name: Identifier,
params?: Expression[],
parent?: Node,
tsOriginal?: ts.Node
): MethodCallExpression
{
const callExpression = createNode(SyntaxKind.MethodCallExpression, parent, tsOriginal) as MethodCallExpression;
setParent(prefixExpression, callExpression);
callExpression.prefixExpression = prefixExpression;
Expand Down
Loading