From 1e2af7aa330c022e3c0e1dc5a817b382f441c631 Mon Sep 17 00:00:00 2001 From: Rene Saarsoo Date: Thu, 23 Aug 2012 02:05:08 +0300 Subject: [PATCH] Fix crash when parsing function with 'return;' --- lib/jsduck/function_ast.rb | 2 +- spec/function_ast_spec.rb | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/jsduck/function_ast.rb b/lib/jsduck/function_ast.rb index d347782c..fce33a39 100644 --- a/lib/jsduck/function_ast.rb +++ b/lib/jsduck/function_ast.rb @@ -37,7 +37,7 @@ module JsDuck end def return_this?(ast) - return?(ast) && this?(ast["argument"]) + return?(ast) && !!ast["argument"] && this?(ast["argument"]) end def return?(ast) diff --git a/spec/function_ast_spec.rb b/spec/function_ast_spec.rb index 7530b880..225d211c 100644 --- a/spec/function_ast_spec.rb +++ b/spec/function_ast_spec.rb @@ -19,6 +19,10 @@ describe "JsDuck::FunctionAst#chainable?" do chainable?("/** */ function foo() {}").should == false end + it "false when body has empty return statement" do + chainable?("/** */ function foo() { return; }").should == false + end + it "true when single RETURN THIS statement in body" do chainable?("/** */ function foo() {return this;}").should == true end -- GitLab