Merge branch 'master' of https://github.com/rokucommunity/brighterscript into ast-to-string

Author: TwitchBronBron

src/PluginInterface.spec.ts

@@ -7,7 +7,7 @@ describe('PluginInterface', () => {
     let pluginInterface: PluginInterface;
 
     beforeEach(() => {
-        pluginInterface = new PluginInterface([], new Logger());
+        pluginInterface = new PluginInterface([], { logger: new Logger() });
     });
 
     it('allows adding a plugin', () => {

src/PluginInterface.ts

@@ -11,8 +11,25 @@ export default class PluginInterface<T extends CompilerPlugin = CompilerPlugin>
 
     constructor(
         private plugins: CompilerPlugin[],
-        private logger: Logger
-    ) { }
+        options: {
+            logger: Logger;
+            suppressErrors?: boolean;
+        }
+    ) {
+        if (options?.constructor.name === 'Logger') {
+            this.logger = options as unknown as Logger;
+        } else {
+            this.logger = options?.logger;
+            this.suppressErrors = options?.suppressErrors === false ? false : true;
+        }
+    }
+
+    private logger: Logger;
+
+    /**
+     * Should plugin errors cause the program to fail, or should they be caught and simply logged
+     */
+    private suppressErrors: boolean;
 
     /**
      * Call `event` on plugins
@@ -26,6 +43,9 @@ export default class PluginInterface<T extends CompilerPlugin = CompilerPlugin>
                     });
                 } catch (err) {
                     this.logger.error(`Error when calling plugin ${plugin.name}.${event}:`, err);
+                    if (!this.suppressErrors) {
+                        throw err;
+                    }
                 }
             }
         }

src/Program.spec.ts

@@ -187,7 +187,7 @@ describe('Program', () => {
                 beforeFileParse: beforeFileParse,
                 afterFileParse: afterFileParse,
                 afterFileValidate: afterFileValidate
-            }], new Logger());
+            }], { logger: new Logger() });
 
             //add a new source file
             program.setFile('source/main.brs', '');

src/Program.ts

@@ -65,7 +65,7 @@ export class Program {
     ) {
         this.options = util.normalizeConfig(options);
         this.logger = logger || new Logger(options.logLevel as LogLevel);
-        this.plugins = plugins || new PluginInterface([], this.logger);
+        this.plugins = plugins || new PluginInterface([], { logger: this.logger });
 
         //inject the bsc plugin as the first plugin in the stack.
         this.plugins.addFirst(new BscPlugin());

src/ProgramBuilder.ts

@@ -36,7 +36,7 @@ export class ProgramBuilder {
     private watcher: Watcher;
     public program: Program;
     public logger = new Logger();
-    public plugins: PluginInterface = new PluginInterface([], this.logger);
+    public plugins: PluginInterface = new PluginInterface([], { logger: this.logger });
     private fileResolvers = [] as FileResolver[];
 
     public addFileResolver(fileResolver: FileResolver) {

src/Scope.spec.ts

@@ -961,7 +961,7 @@ describe('Scope', () => {
             program.setFile(s`components/comp.brs`, ``);
             const sourceScope = program.getScopeByName('source');
             const compScope = program.getScopeByName('components/comp.xml');
-            program.plugins = new PluginInterface([], new Logger());
+            program.plugins = new PluginInterface([], { logger: new Logger() });
             const plugin = program.plugins.add({
                 name: 'Emits validation events',
                 beforeScopeValidate: sinon.spy(),

src/bscPlugin/validation/BrsFileValidator.ts

@@ -301,14 +301,14 @@ export class BrsFileValidator {
     }
 
     private validateContinueStatement(statement: ContinueStatement) {
-        const validateLoopTypeMatch = (loopType: TokenKind) => {
+        const validateLoopTypeMatch = (expectedLoopType: TokenKind) => {
             //coerce ForEach to For
-            loopType = loopType === TokenKind.ForEach ? TokenKind.For : loopType;
-
-            if (loopType?.toLowerCase() !== statement.tokens.loopType.text?.toLowerCase()) {
+            expectedLoopType = expectedLoopType === TokenKind.ForEach ? TokenKind.For : expectedLoopType;
+            const actualLoopType = statement.tokens.loopType;
+            if (actualLoopType && expectedLoopType?.toLowerCase() !== actualLoopType.text?.toLowerCase()) {
                 this.event.file.addDiagnostic({
                     range: statement.tokens.loopType.range,
-                    ...DiagnosticMessages.expectedToken(loopType)
+                    ...DiagnosticMessages.expectedToken(expectedLoopType)
                 });
             }
         };

src/files/BrsFile.spec.ts

@@ -3385,7 +3385,7 @@ describe('BrsFile', () => {
                 util.loadPlugins(tempDir, [
                     s`${tempDir}/plugins/${pluginFileName}`
                 ]),
-                new Logger()
+                { logger: new Logger() }
             );
             const file = program.setFile<any>('source/MAIN.brs', '');
             expect(file._customProp).to.exist;
@@ -3396,7 +3396,7 @@ describe('BrsFile', () => {
                 util.loadPlugins(tempDir, [
                     `./plugins/${pluginFileName}`
                 ]),
-                new Logger()
+                { logger: new Logger() }
             );
             const file = program.setFile<any>('source/MAIN.brs', '');
             expect(file._customProp).to.exist;

src/parser/tests/statement/Continue.spec.ts

@@ -108,4 +108,19 @@ describe('parser continue statements', () => {
             end sub
         `);
     });
+
+    it('does not crash when missing loop type', () => {
+        program.plugins['suppressErrors'] = false;
+        program.setFile('source/main.brs', `
+            sub main()
+                while true
+                    continue
+                end while
+            end sub
+        `);
+        program.validate();
+        expectDiagnostics(program, [
+            DiagnosticMessages.expectedToken(TokenKind.While, TokenKind.For).message
+        ]);
+    });
 });