Reverted some more forgotten stuff

Perryvw · Perryvw · commit 8da608dd0cab · 2019-11-27T20:32:32.000+01:00
diff --git a/src/bundle.ts b/src/bundle.ts
@@ -65,7 +65,7 @@ function require(file)
         if ____originalRequire then
             return ____originalRequire(file)
         else
-            print("Could not find module '" .. file .. "' to require.")
+            error("module '" .. file .. "' not found")
         end
     end
 end\n`;
diff --git a/test/unit/functions/noImplicitSelfOption.spec.ts b/test/unit/functions/noImplicitSelfOption.spec.ts
@@ -6,7 +6,7 @@ test("enables noSelfInFile behaviour for functions", () => {
         const test: (this: void) => void = fooBar;
     `
         .setOptions({ noImplicitSelf: true })
-        .expectToHaveNoErrorDiagnostics();
+        .expectToHaveNoDiagnostics();
 });
 
 test("enables noSelfInFile behaviour for methods", () => {
@@ -18,15 +18,15 @@ test("enables noSelfInFile behaviour for methods", () => {
         const test: (this: any) => void = fooBar.fooBar;
     `
         .setOptions({ noImplicitSelf: true })
-        .expectToHaveNoErrorDiagnostics();
+        .expectToHaveNoDiagnostics();
 });
 
 test("generates declaration files with @noSelfInFile", () => {
     const builder = util.testModule`
         export function bar() {}
     `
         .setOptions({ declaration: true, noImplicitSelf: true })
-        .expectToHaveNoErrorDiagnostics();
+        .expectToHaveNoDiagnostics();
 
     const declarationFile = builder.getLuaResult().transpiledFiles.find(f => f.declaration);
     if (!util.expectToBeDefined(declarationFile) || !util.expectToBeDefined(declarationFile.declaration)) return;
@@ -36,5 +36,5 @@ test("generates declaration files with @noSelfInFile", () => {
         const test: (this: void) => void = bar;
     `
         .addExtraFile("foo.d.ts", declarationFile.declaration)
-        .expectToHaveNoErrorDiagnostics();
+        .expectToHaveNoDiagnostics();
 });
diff --git a/test/unit/functions/validation/functionExpressionTypeInference.spec.ts b/test/unit/functions/validation/functionExpressionTypeInference.spec.ts
@@ -24,7 +24,7 @@ test("noSelfInFile works when first statement has other annotations", () => {
         function foo() {}
 
         const test: (this: void) => void = foo;
-    `.expectToHaveNoErrorDiagnostics();
+    `.expectToHaveNoDiagnostics();
 });
 
 test.each(["(this: void, s: string) => string", "(this: any, s: string) => string", "(s: string) => string"])(
diff --git a/test/unit/printer/sourcemaps.spec.ts b/test/unit/printer/sourcemaps.spec.ts
@@ -152,7 +152,7 @@ test.each([
 ])("Source map has correct mapping (%p)", async ({ code, assertPatterns }) => {
     const file = util
         .testModule(code)
-        .expectToHaveNoErrorDiagnostics()
+        .expectToHaveNoDiagnostics()
         .getMainLuaFileResult();
 
     const consumer = await new SourceMapConsumer(file.sourceMap);
@@ -169,7 +169,7 @@ test("Source map has correct sources", async () => {
     const file = util.testModule`
         const foo = "foo"
     `
-        .expectToHaveNoErrorDiagnostics()
+        .expectToHaveNoDiagnostics()
         .getMainLuaFileResult();
 
     const consumer = await new SourceMapConsumer(file.sourceMap);
@@ -181,7 +181,7 @@ test("Source map has correct source root", async () => {
     const file = util.testModule`
         const foo = "foo"
     `
-        .expectToHaveNoErrorDiagnostics()
+        .expectToHaveNoDiagnostics()
         .getMainLuaFileResult();
 
     const sourceMap = JSON.parse(file.sourceMap);
@@ -199,7 +199,7 @@ test.each([
 ])("Source map has correct name mappings (%p)", async ({ code, name }) => {
     const file = util
         .testModule(code)
-        .expectToHaveNoErrorDiagnostics()
+        .expectToHaveNoDiagnostics()
         .getMainLuaFileResult();
 
     const consumer = await new SourceMapConsumer(file.sourceMap);
diff --git a/test/util.ts b/test/util.ts
@@ -363,21 +363,11 @@ export abstract class TestBuilder {
         return this;
     }
 
-    public expectToHaveNoErrorDiagnostics(): this {
+    public expectToHaveNoDiagnostics(): this {
         expect(this.getLuaDiagnostics()).not.toHaveDiagnostics();
         return this;
     }
 
-    /*public expectExecutionError(message: string): this {
-        const luaResult = this.getLuaExecutionResult();
-        if (!(luaResult instanceof ExecutionError)) {
-            expect(luaResult).toBeInstanceOf(ExecutionError);
-        } else {
-            expect(luaResult.message).toContain(message);
-        }
-        return this;
-    }*/
-
     public expectNoExecutionError(): this {
         const luaResult = this.getLuaExecutionResult();
         if (luaResult instanceof ExecutionError) {
@@ -388,7 +378,7 @@ export abstract class TestBuilder {
     }
 
     public expectToMatchJsResult(allowErrors = false): this {
-        this.expectToHaveNoErrorDiagnostics();
+        this.expectToHaveNoDiagnostics();
         if (!allowErrors) this.expectNoExecutionError();
 
         const luaResult = this.getLuaExecutionResult();
@@ -399,20 +389,20 @@ export abstract class TestBuilder {
     }
 
     public expectToEqual(expected: any): this {
-        this.expectToHaveNoErrorDiagnostics();
+        this.expectToHaveNoDiagnostics();
         const luaResult = this.getLuaExecutionResult();
         expect(luaResult).toEqual(expected);
         return this;
     }
 
     public expectLuaToMatchSnapshot(): this {
-        this.expectToHaveNoErrorDiagnostics();
+        this.expectToHaveNoDiagnostics();
         expect(this.getMainLuaCodeChunk()).toMatchSnapshot();
         return this;
     }
 
     public expectResultToMatchSnapshot(): this {
-        this.expectToHaveNoErrorDiagnostics();
+        this.expectToHaveNoDiagnostics();
         expect(this.getLuaExecutionResult()).toMatchSnapshot();
         return this;
     }
