Removed mistakenly cached brsFile.validationSegments

rokucommunity · Nov 2, 2023 · 0341f8d · 0341f8d
1 parent 5b5c844
commit 0341f8d
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 31 deletions.
diff --git a/benchmarks/package-lock.json b/benchmarks/package-lock.json
diff --git a/src/Program.ts b/src/Program.ts
@@ -817,12 +817,12 @@ export class Program {
                         file: file
                     };
                     this.plugins.emit('beforeFileValidate', validateFileEvent);
-                    const t0 = performance.now();
+                    //  const t0 = performance.now();
                     //emit an event to allow plugins to contribute to the file validation process
                     this.plugins.emit('onFileValidate', validateFileEvent);
                     file.isValidated = true;
-                    const t1 = performance.now();
-                    console.log('validateFileEvent', file.pkgPath, t1 - t0);
+                    //  const t1 = performance.now();
+                    //console.log('validateFileEvent', file.pkgPath, t1 - t0);
                     this.plugins.emit('afterFileValidate', validateFileEvent);
                 }
             }

diff --git a/src/Scope.spec.ts b/src/Scope.spec.ts
@@ -3107,8 +3107,6 @@ describe('Scope', () => {
 
             let symbolTables = getSymbolTableList();
 
-            console.log(symbolTables.map(x => `${x.name} ${x['siblings'].size}`));
-
             symbolTables.forEach(x => expect(x['siblings'].size).to.eql(1, `${x.name} has wrong number of siblings`));
 
             scope.unlinkSymbolTable();
@@ -3129,7 +3127,7 @@ describe('Scope', () => {
     describe('performance', () => {
 
         // eslint-disable-next-line func-names, prefer-arrow-callback
-        it('namespace linking performance', function () {
+        it.skip('namespace linking performance', function () {
             this.timeout(30000); // this test takes a long time!
             program.options.autoImportComponentScript = true;
             const constFileContents = `

diff --git a/src/Scope.ts b/src/Scope.ts
@@ -753,21 +753,21 @@ export class Scope {
             let callableContainerMap = util.getCallableContainersByLowerName(callables);
 
             //Since statements from files are shared across multiple scopes, we need to link those statements to the current scope
-            const t0 = performance.now();
+            //const t0 = performance.now();
             this.linkSymbolTable();
-            const t1 = performance.now();
-            console.log('onScopeValidate() - linkSymbolTable', this.name, t1 - t0);
+            //const t1 = performance.now();
+            //console.log('onScopeValidate() - linkSymbolTable', this.name, t1 - t0);
             const scopeValidateEvent = {
                 program: this.program,
                 scope: this
             };
             this.program.plugins.emit('beforeScopeValidate', scopeValidateEvent);
             this.program.plugins.emit('onScopeValidate', scopeValidateEvent);
-            const t2 = performance.now();
-            console.log('onScopeValidate() - scopeValidateEvent', this.name, t2 - t1);
+            //const t2 = performance.now();
+            //console.log('onScopeValidate() - scopeValidateEvent', this.name, t2 - t1);
             this._validate(callableContainerMap);
-            const t3 = performance.now();
-            console.log('onScopeValidate() - _validate', this.name, t3 - t2);
+            //const t3 = performance.now();
+            //console.log('onScopeValidate() - _validate', this.name, t3 - t2);
             this.program.plugins.emit('afterScopeValidate', scopeValidateEvent);
             //unlink all symbol tables from this scope (so they don't accidentally stick around)
             this.unlinkSymbolTable();

diff --git a/src/bscPlugin/validation/ScopeValidator.ts b/src/bscPlugin/validation/ScopeValidator.ts
@@ -54,6 +54,8 @@ export class ScopeValidator {
 
     private walkFiles() {
 
+        //function signatures incompatible cross scopes
+
         this.event.scope.enumerateOwnFiles((file) => {
             if (isBrsFile(file)) {
                 const validationVisitor = createVisitor({

diff --git a/src/files/BrsFile.ts b/src/files/BrsFile.ts
@@ -1335,16 +1335,16 @@ export class BrsFile implements File {
     }
 
     public getValidationSegments() {
-        return this.cache.getOrAdd(`validationSegments`, () => {
-            if (BrsFile.reduceReValidation) {
-                const t0 = performance.now();
-                const segments = this.validationSegmenter.getSegments();
-                const t1 = performance.now();
-                console.log('validationSegmenter.getSegments()', this.pkgPath, t1 - t0);
-                return segments;
-            }
-            return [this.ast];
-        });
+        // return this.cache.getOrAdd(`validationSegments`, () => {
+        if (BrsFile.reduceReValidation) {
+            //const t0 = performance.now();
+            const segments = this.validationSegmenter.getSegments();
+            //const t1 = performance.now();
+            // console.log('validationSegmenter.getSegments()', this.pkgPath, t1 - t0);
+            return segments;
+        }
+        return [this.ast];
+        // });
     }
 
     public markSegmentAsValidated(node: AstNode) {
@@ -1353,10 +1353,10 @@ export class BrsFile implements File {
 
     public getNamespaceLookupObject() {
         return this.cache.getOrAdd(`namespaceLookup`, () => {
-            const t0 = performance.now();
+            //const t0 = performance.now();
             const nsLookup = this.buildNamespaceLookup();
-            const t1 = performance.now();
-            console.log('buildNamespaceLookup()', this.pkgPath, t1 - t0);
+            // const t1 = performance.now();
+            //console.log('buildNamespaceLookup()', this.pkgPath, t1 - t0);
             return nsLookup;
         });
     }