Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Mon, 24 Nov 2014 01:41:17 UTC Commit: f158f5d362404a3bec09c8841537e981ade5de2f https://github.com/geany/geany/commit/f158f5d362404a3bec09c8841537e981ade5de...

Log Message: ----------- javascript: Fix scope after some constructs

Modified Paths: -------------- tagmanager/ctags/js.c tests/ctags/Makefile.am tests/ctags/js-scope.js tests/ctags/js-scope.js.tags tests/ctags/ui5.controller.js.tags

Modified: tagmanager/ctags/js.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -1243,7 +1243,6 @@ static boolean parseStatement (tokenInfo *const token, boolean is_inside_class) { if ( is_class ) { - vStringCopy(saveScope, token->scope); addToScope(token, name->string); } else

Modified: tests/ctags/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -159,6 +159,7 @@ test_sources = \ intro.tex \ invalid_name.f90 \ java_enum.java \ + js-scope.js \ jsFunc_tutorial.js \ keyword_abstract.cs \ keyword_catch_try.cs \

Modified: tests/ctags/js-scope.js 18 lines changed, 18 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,18 @@ + +function A() { + this.a = 1; +} + +A.prototype = { + m1 : function() { + this.a = 2; + + foo.bar.baz.hello(1); + foo.bar.baz.hello(2); + foo.bar.baz.hello(3); + }, + + m2: function() { + return this.a; + }, +};

Modified: tests/ctags/js-scope.js.tags 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,4 @@ +# format=tagmanager +A�1�0 +m1�128�A�0 +m2�128�A�0

Modified: tests/ctags/ui5.controller.js.tags 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -1,6 +1,6 @@ # format=tagmanager onInit�128�app.my_form�0 -refreshForm�128�sap.app.my_form�0 -refreshSettlements�128�sap.app.my_form�0 -setRefreshed�128�sap.app.my_form�0 +refreshForm�128�app.my_form�0 +refreshSettlements�128�app.my_form�0 +setRefreshed�128�app.my_form�0 successfulRequest�128�app.my_form�0

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).