fixes

Author: Alex D

spec/variable_declarations.spec.ts

@@ -99,8 +99,8 @@ describe('Variable Declarations', () => {
  'const numLivesForCat = 9; \
  const kitty = { \
  name: "Aurora", \
- numLives: numLivesForCat, \
- }  \
+ numLives: numLivesForCat  \
+ }; \
  \
  kitty.name = "Rory"; \
  kitty.name = "Kitty"; \

src/emitterlua.ts

@@ -743,8 +743,7 @@ export class EmitterLua {
  if (effectiveLocation.kind !== ts.SyntaxKind.MethodDeclaration
  && effectiveLocation.kind !== ts.SyntaxKind.GetAccessor
  && effectiveLocation.kind !== ts.SyntaxKind.SetAccessor
- && (effectiveLocation.parent.kind === ts.SyntaxKind.SourceFile
- || effectiveLocation.parent.kind === ts.SyntaxKind.NamespaceKeyword))
+ && !this.isValueNotRequired(effectiveLocation.parent))
  {
  this.functionContext.textCode.push(name);
  }
@@ -3539,6 +3538,12 @@ export class EmitterLua {
  && node.parent.kind === ts.SyntaxKind.CallExpression
  && (<ts.CallExpression>node.parent).expression == node) {
  thisCall = true;
+
+ const typeInfo = this.typeInfo.getVariableDeclarationOfTypeOfNode(node.expression);
+ if (typeInfo && typeInfo.kind === ts.SyntaxKind.ModuleDeclaration)
+ {
+ thisCall = false;
+ }
  }
 
  // support __wrapper calls

test/test.ts

@@ -1,5 +1,10 @@
-function f() { 
- var message = "Hello, world!"; 
- return message; 
+function f() { 
+ var a = 10; 
+ return function g() { 
+ var b = a + 1; 
+ return b; 
+ } 
  } 
- console.log(f()); 
+ 
+ var g = f(); 
+ console.log(g());