Skip to content

Commit 146053c

Browse files
hazzard993hazzard993
committed
Remaining helper references
1 parent e0d3cf4 commit 146053c

7 files changed

Lines changed: 12 additions & 12 deletions

File tree

‎src/transformation/utils/language-extensions.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ export enum ExtensionKind {
77
}
88

99
function isSourceFileFromLanguageExtensions(sourceFile: ts.SourceFile): boolean {
10-
const helperDirectory = path.resolve(__dirname, "../../../language-extensions");
10+
const extensionDirectory = path.resolve(__dirname, "../../../language-extensions");
1111
const sourceFileDirectory = path.dirname(path.normalize(sourceFile.fileName));
12-
return helperDirectory === sourceFileDirectory;
12+
return extensionDirectory === sourceFileDirectory;
1313
}
1414

1515
export function getExtensionKind(declaration: ts.Declaration): ExtensionKind | undefined {

‎src/transformation/visitors/expression-statement.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import { transformBinaryExpressionStatement } from "./binary-expression";
55
import { transformDeleteExpressionStatement } from "./delete";
66
import { transformLuaTableExpressionStatement } from "./lua-table";
77
import { transformUnaryExpressionStatement } from "./unary-expression";
8-
import { transformMultiHelperDestructuringAssignmentStatement } from "./language-extensions/multi";
8+
import { transformMultiDestructuringAssignmentStatement } from "./language-extensions/multi";
99

1010
export const transformExpressionStatement: FunctionVisitor<ts.ExpressionStatement> = (node, context) => {
11-
const multiResult = transformMultiHelperDestructuringAssignmentStatement(context, node);
11+
const multiResult = transformMultiDestructuringAssignmentStatement(context, node);
1212
if (multiResult) {
1313
return multiResult;
1414
}

‎src/transformation/visitors/language-extensions/multi.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ function transformMultiFunctionArguments(
6565
return expression.arguments.map(e => context.transformExpression(e));
6666
}
6767

68-
export function transformMultiHelperVariableDeclaration(
68+
export function transformMultiVariableDeclaration(
6969
context: TransformationContext,
7070
declaration: ts.VariableDeclaration
7171
): lua.Statement[] | undefined {
@@ -111,7 +111,7 @@ export function transformMultiHelperVariableDeclaration(
111111
return createLocalOrExportedOrGlobalDeclaration(context, leftIdentifiers, rightExpressions, declaration);
112112
}
113113

114-
export function transformMultiHelperDestructuringAssignmentStatement(
114+
export function transformMultiDestructuringAssignmentStatement(
115115
context: TransformationContext,
116116
statement: ts.ExpressionStatement
117117
): lua.Statement[] | undefined {
@@ -161,7 +161,7 @@ export function transformMultiHelperDestructuringAssignmentStatement(
161161
return [lua.createAssignmentStatement(leftIdentifiers, rightExpressions, statement), ...trailingStatements];
162162
}
163163

164-
export function findMultiHelperAssignmentViolations(
164+
export function findMultiAssignmentViolations(
165165
context: TransformationContext,
166166
node: ts.ObjectLiteralExpression
167167
): ts.Node[] {

‎src/transformation/visitors/literal.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { getSymbolIdOfSymbol, trackSymbolReference } from "../utils/symbols";
1010
import { isArrayType } from "../utils/typescript";
1111
import { transformFunctionLikeDeclaration } from "./function";
1212
import { flattenSpreadExpressions } from "./call";
13-
import { findMultiHelperAssignmentViolations } from "./language-extensions/multi";
13+
import { findMultiAssignmentViolations } from "./language-extensions/multi";
1414

1515
// TODO: Move to object-literal.ts?
1616
export function transformPropertyName(context: TransformationContext, node: ts.PropertyName): lua.Expression {
@@ -63,7 +63,7 @@ const transformNumericLiteralExpression: FunctionVisitor<ts.NumericLiteral> = ex
6363
};
6464

6565
const transformObjectLiteralExpression: FunctionVisitor<ts.ObjectLiteralExpression> = (expression, context) => {
66-
const violations = findMultiHelperAssignmentViolations(context, expression);
66+
const violations = findMultiAssignmentViolations(context, expression);
6767
if (violations.length > 0) {
6868
context.diagnostics.push(...violations.map(e => invalidMultiFunctionUse(e)));
6969
return lua.createNilLiteral(expression);

‎src/transformation/visitors/variable-declaration.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { createLocalOrExportedOrGlobalDeclaration, createUnpackCall } from "../u
1010
import { LuaLibFeature, transformLuaLibFunction } from "../utils/lualib";
1111
import { transformIdentifier } from "./identifier";
1212
import { transformPropertyName } from "./literal";
13-
import { transformMultiHelperVariableDeclaration } from "./language-extensions/multi";
13+
import { transformMultiVariableDeclaration } from "./language-extensions/multi";
1414

1515
export function transformArrayBindingElement(
1616
context: TransformationContext,
@@ -218,7 +218,7 @@ export function transformVariableDeclaration(
218218
context: TransformationContext,
219219
statement: ts.VariableDeclaration
220220
): lua.Statement[] {
221-
const result = transformMultiHelperVariableDeclaration(context, statement);
221+
const result = transformMultiVariableDeclaration(context, statement);
222222
if (result) {
223223
return result;
224224
}

test/unit/helpers/__snapshots__/multi.spec.ts.snap renamed to test/unit/language-extensions/__snapshots__/multi.spec.ts.snap

File renamed without changes.

test/unit/helpers/multi.spec.ts renamed to test/unit/language-extensions/multi.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ test("function to spread multi type result from multi type function", () => {
9292
.expectToEqual(true);
9393
});
9494

95-
test("$multi helper call with destructuring assignment side effects", () => {
95+
test("$multi call with destructuring assignment side effects", () => {
9696
util.testModule`
9797
${multiFunction}
9898
let a;

0 commit comments

Comments
 (0)