Fix: Label Functions and Methods declartions as Ambient (fixes #162)

Ambient functions do not have a body and will cuase rules to throw an excpetion. We use the types TSAmbientFunctionExpression and TSAmbientMethoDeclaration.
eslint · Feb 20, 2017 · da6769e · da6769e
1 parent 76c33f8
commit da6769e
Show file tree

Hide file tree

Showing 8 changed files with 1,441 additions and 6 deletions.
diff --git a/lib/ast-converter.js b/lib/ast-converter.js
@@ -875,7 +875,7 @@ module.exports = function(ast, extra) {
                         return modifier.kind === ts.SyntaxKind.DeclareKeyword;
                     });
                     if (isDeclareFunction) {
-                        functionDeclarationType = "DeclareFunction";
+                        functionDeclarationType = "TSAmbientFunctionDeclaration";
                     }
                 }
 
@@ -1074,8 +1074,10 @@ module.exports = function(ast, extra) {
                 // TODO: double-check that these positions are correct
                 var methodLoc = ast.getLineAndCharacterOfPosition(node.name.end + 1),
                     nodeIsMethod = (node.kind === SyntaxKind.MethodDeclaration),
+                    isAmbient = ts.isInAmbientContext(node),
+                    type = (!isAmbient) ? "FunctionExpression" : "TSAmbientFunctionExpression",
                     method = {
-                        type: "FunctionExpression",
+                        type: type,
                         id: null,
                         generator: false,
                         expression: false,
@@ -1136,6 +1138,9 @@ module.exports = function(ast, extra) {
                             methodDefinitionType = "TSAbstractMethodDefinition";
                         }
                     }
+                    if (isAmbient) {
+                        methodDefinitionType = "TSAmbientMethodDefinition";
+                    }
 
                     assign(result, {
                         type: methodDefinitionType,
@@ -1167,8 +1172,10 @@ module.exports = function(ast, extra) {
                 var constructorIsStatic = Boolean(node.flags & ts.NodeFlags.Static),
                     firstConstructorToken = constructorIsStatic ? ts.findNextToken(node.getFirstToken(), ast) : node.getFirstToken(),
                     constructorLoc = ast.getLineAndCharacterOfPosition(node.parameters.pos - 1),
+                    constructorIsAmbient = ts.isInAmbientContext(node),
+                    constructorType = (!constructorIsAmbient) ? "FunctionExpression" : "TSAmbientFunctionExpression",
                     constructor = {
-                        type: "FunctionExpression",
+                        type: constructorType,
                         id: null,
                         params: node.parameters.map(function(param) {
                             var convertedParam = convertChild(param);
@@ -1231,7 +1238,7 @@ module.exports = function(ast, extra) {
                 }
 
                 assign(result, {
-                    type: "MethodDefinition",
+                    type: (!constructorIsAmbient) ? "MethodDefinition" : "TSAmbientMethodDefintion",
                     key: constructorKey,
                     value: constructor,
                     computed: constructorIsComputed,