Commit 76d86727 authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Move all method-detection stuff to Js::Method.

parent d8bbbae9

lib/jsduck/js/ast.rb

+2 −24
Original line number Diff line number Diff line
@@ -105,29 +105,7 @@ module JsDuck 
      end



      def detect_method(ast, exp, var)

        # function foo() {}

        if ast.function?

          make_method(ast["id"].to_s || "", ast)



          # foo = function() {}

        elsif exp && exp.assignment_expression? && exp["right"].function?

          make_method(exp["left"].to_s, exp["right"])



          # var foo = function() {}

        elsif var && var["init"] && var["init"].function?

          make_method(var["id"].to_s, var["init"])



          # (function() {})

        elsif exp && exp.function?

          make_method(exp["id"].to_s || "", exp)



          # foo: function() {}

        elsif ast.property? && ast["value"].function?

          make_method(ast["key"].key_value, ast["value"])



        else

          nil

        end

        Js::Method.detect(ast, exp, var)

      end



      # this.fireEvent("foo", ...)
@@ -342,7 +320,7 @@ module JsDuck 
      end



      def make_method(name, ast)

        Js::Method.detect(name, ast)

        Js::Method.make(name, ast)

      end



      def make_event(name)

lib/jsduck/js/method.rb

+33 −3
Original line number Diff line number Diff line
@@ -6,12 +6,42 @@ require "jsduck/js/method_calls" 
module JsDuck

  module Js



    # Auto-detection of methods.

    class Method

      include Util::Singleton



      # Detects various properties of a method from AST node and

      # returns a documentation hash with these and method name.

      def detect(name, ast)

      # Checks if AST node is a method, and if so, returns doc-hash

      # with method name and various auto-detected properties.

      # When not a method returns nil.

      def detect(ast, exp, var)

        # function foo() {}

        if ast.function?

          make(ast["id"].to_s || "", ast)



          # foo = function() {}

        elsif exp && exp.assignment_expression? && exp["right"].function?

          make(exp["left"].to_s, exp["right"])



          # var foo = function() {}

        elsif var && var["init"] && var["init"].function?

          make(var["id"].to_s, var["init"])



          # (function() {})

        elsif exp && exp.function?

          make(exp["id"].to_s || "", exp)



          # foo: function() {}

        elsif ast.property? && ast["value"].function?

          make(ast["key"].key_value, ast["value"])



        else

          nil

        end

      end



      # Performs the auto-detection on function AST node and produces

      # a doc-hash.

      def make(name, ast)

        if proper_function?(ast)

          return {

            :tagname => :method,