Branch: refs/heads/master Author: Jiří Techet techet@gmail.com Committer: Jiří Techet techet@gmail.com Date: Sat, 27 Apr 2024 18:54:32 UTC Commit: 978eb03e3bb33612013495054238fbc2a66683cf https://github.com/geany/geany/commit/978eb03e3bb33612013495054238fbc2a66683...

Log Message: ----------- Update unit tests for javascript

There are lots of differences because of

https://github.com/universal-ctags/ctags/commit/6d85089456ed215ce6b6a673744a...

Also

https://github.com/universal-ctags/ctags/commit/b1870b826a384c35671937743720...

seems to confuse the parser in simple.js so it doesn't generate my_global_var2.

Finally, Geany reports

(geany:820768): Tagmanager-WARNING **: 20:38:28.755: ignoring null tag in /home/parallels/projects/geany/doc/reference/jquery.js(line: 2, language: JavaScript)

Modified Paths: -------------- tests/ctags/1795612.js.tags tests/ctags/1850914.js.tags tests/ctags/1878155.js.tags tests/ctags/1880687.js.tags tests/ctags/3470609.js.tags tests/ctags/arraylist.js.tags tests/ctags/bracematch.js.tags tests/ctags/bug1950327.js.tags tests/ctags/bug2888482.js.tags tests/ctags/bug3571233.js.tags tests/ctags/complex-return.js.tags tests/ctags/js-class-related-unterminated.js.tags tests/ctags/js-const.js.tags tests/ctags/js-let.js.tags tests/ctags/js-string-continuation.js.tags tests/ctags/js-unknown-construct-nesting.js.tags tests/ctags/jsFunc_tutorial.js.tags tests/ctags/parenthesis-rvalue.js.tags tests/ctags/secondary_fcn_name.js.tags tests/ctags/simple.js.tags tests/ctags/ui5.controller.js.tags

Modified: tests/ctags/1795612.js.tags 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1,5 +1,5 @@ -RPC�1�Test�0 -class: Test :: RPC +Test.RPC�64�0 +member: Test.RPC asyncMethod�128�( uri, method, params, callback)�Test.RPC�0 method: Test.RPC :: asyncMethod( uri, method, params, callback) asyncRequest�128�( uri, data, callback)�Test.RPC�0

Modified: tests/ctags/1850914.js.tags 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -2,5 +2,5 @@ objLiteralMethod method: objectLiteral :: objLiteralMethod() objLiteralProperty�64�objectLiteral�0 member: objectLiteral :: objLiteralProperty -objectLiteral�1�0 -class: objectLiteral +objectLiteral�16384�0 +variable: objectLiteral

Modified: tests/ctags/1878155.js.tags 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1,5 +1,5 @@ -RE�1�0 -class: RE +RE�16384�0 +variable: RE bar�64�RE�0 member: RE :: bar foo�16384�0

Modified: tests/ctags/1880687.js.tags 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1,5 +1,5 @@ -MyClass�1�0 -class: MyClass +MyClass�16384�0 +variable: MyClass MyClass_sub1�128�(x)�MyClass�0 method: MyClass :: MyClass_sub1(x) MyClass_sub2�128�(x)�MyClass�0

Modified: tests/ctags/3470609.js.tags 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -12,13 +12,13 @@ neg member: root :: neg parentheses�64�root�0 member: root :: parentheses -root�1�0 -class: root +root�16384�0 +variable: root string�64�root�0 member: root :: string subFunction�128�()�root.subObject�0 method: root.subObject :: subFunction() -subObject�1�root�0 -class: root :: subObject +subObject�64�root�0 +member: root :: subObject subProperty�64�root.subObject�0 member: root.subObject :: subProperty

Modified: tests/ctags/arraylist.js.tags 34 lines changed, 30 insertions(+), 4 deletions(-) =================================================================== @@ -1,16 +1,42 @@ +a�64�anon_variable_1�0 +member: anon_variable_1 :: a +a�64�anon_variable_2�0 +member: anon_variable_2 :: a +a�64�class.anon_variable_3�0 +member: class.anon_variable_3 :: a +a�64�class.anon_variable_4�0 +member: class.anon_variable_4 :: a a�16384�0 variable: a +anon_variable_1�16384�1 +variable: anon_variable_1 flags: 1 +anon_variable_2�16384�1 +variable: anon_variable_2 flags: 1 +anon_variable_3�16384�class�1 +variable: class :: anon_variable_3 flags: 1 +anon_variable_4�16384�class�1 +variable: class :: anon_variable_4 flags: 1 +b�64�anon_variable_1�0 +member: anon_variable_1 :: b +b�64�anon_variable_2�0 +member: anon_variable_2 :: b +b�64�class.anon_variable_3�0 +member: class.anon_variable_3 :: b +b�64�class.anon_variable_4�0 +member: class.anon_variable_4 :: b b�16384�0 variable: b bar�64�class.test1�0 member: class.test1 :: bar c�16384�0 variable: c -class�1�()�0 -class: class() +class�16�()�0 +function: class() foo�64�class.test1�0 member: class.test1 :: foo -test1�1�class�0 -class: class :: test1 +test1�64�class�0 +member: class :: test1 +test2�64�class�0 +member: class :: test2 test3�128�()�class�0 method: class :: test3()

Modified: tests/ctags/bracematch.js.tags 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -1,7 +1,7 @@ -Container�16�()�0 -function: Container() -MyClass�1�0 -class: MyClass +Container�1�()�0 +class: Container() +MyClass�16384�0 +variable: MyClass insert�128�(element, insertions)�MyClass�0 method: MyClass :: insert(element, insertions) wrap�128�(element, wrapper, attributes)�MyClass�0

Modified: tests/ctags/bug1950327.js.tags 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -4,6 +4,8 @@ Different class: Different TabChrome�1�0 class: TabChrome +container.dirtyTab�64�0 +member: container.dirtyTab createTabTile�128�(browser)�Different�0 method: Different :: createTabTile(browser) createTabTile�128�(browser)�TabChrome�0 @@ -12,8 +14,6 @@ destroyTabTile method: Different :: destroyTabTile(tile) destroyTabTile�128�(tile)�TabChrome�0 method: TabChrome :: destroyTabTile(tile) -dirtyTab�1�container�0 -class: container :: dirtyTab init�128�()�Different�0 method: Different :: init() init�128�()�TabChrome�0

Modified: tests/ctags/bug2888482.js.tags 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,5 @@ +editFormEl�16384�0 +variable: editFormEl onsubmit�16�()�editFormEl�0 function: editFormEl :: onsubmit() scrollEditBox�16�()�0

Modified: tests/ctags/bug3571233.js.tags 6 lines changed, 2 insertions(+), 4 deletions(-) =================================================================== @@ -1,7 +1,5 @@ -MyClass�1�0 -class: MyClass -MyClass�16�()�0 -function: MyClass() +MyClass�1�()�0 +class: MyClass() function1�16�()�0 function: function1() function2�16�()�0

Modified: tests/ctags/complex-return.js.tags 16 lines changed, 8 insertions(+), 8 deletions(-) =================================================================== @@ -12,14 +12,14 @@ c3m1 method: class3 :: c3m1() c3m2�128�()�class3�0 method: class3 :: c3m2() -class1�1�()�0 -class: class1() -class2�1�()�0 -class: class2() -class3�1�()�0 -class: class3() -class4�1�()�0 -class: class4() +class1�16�()�0 +function: class1() +class2�16�()�0 +function: class2() +class3�16�()�0 +function: class3() +class4�16�()�0 +function: class4() func1�16�()�0 function: func1() func2�16�()�0

Modified: tests/ctags/js-class-related-unterminated.js.tags 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -4,8 +4,8 @@ B class: Cls :: B(a, b) C�1�()�Cls�0 class: Cls :: C() -Cls�1�0 -class: Cls +Cls�16384�0 +variable: Cls Sub�1�0 class: Sub Sub�1�()�Cls.B�0

Modified: tests/ctags/js-const.js.tags 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -2,8 +2,8 @@ A macro: A B�65536�0 macro: B -Group�1�0 -class: Group +Group�16384�0 +variable: Group X�64�Group�0 member: Group :: X Y�64�Group�0

Modified: tests/ctags/js-let.js.tags 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -4,8 +4,8 @@ b variable: b func�16�()�0 function: func() -group�1�0 -class: group +group�16384�0 +variable: group x�64�group�0 member: group :: x y�64�group�0

Modified: tests/ctags/js-string-continuation.js.tags 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -2,8 +2,8 @@ first method: o :: first() fourth�128�()�o�0 method: o :: fourth() -o�1�0 -class: o +o�16384�0 +variable: o second�128�()�o�0 method: o :: second() third�128�()�o�0

Modified: tests/ctags/js-unknown-construct-nesting.js.tags 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -4,5 +4,5 @@ bb method: o :: bb(a) cc�128�()�o�0 method: o :: cc() -o�1�0 -class: o +o�16384�0 +variable: o

Modified: tests/ctags/jsFunc_tutorial.js.tags 98 lines changed, 58 insertions(+), 40 deletions(-) =================================================================== @@ -1,27 +1,27 @@ -Ball1�16�()�0 -function: Ball1() -Ball3�16�()�0 -function: Ball3() -D1�16�(a, b)�0 -function: D1(a, b) -D2�16�(a, b)�0 -function: D2(a, b) -D2A�16�(a, b)�0 -function: D2A(a, b) -D3�16�0 -function: D3 -D4�16�0 -function: D4 -D5�16�(myOperator)�0 -function: D5(myOperator) -DT1�16�()�0 -function: DT1() -DT2�16�(message)�0 -function: DT2(message) -DT2A�16�(message)�0 -function: DT2A(message) -DT3�16�()�0 -function: DT3() +Ball1�1�()�0 +class: Ball1() +Ball3�1�()�0 +class: Ball3() +D1�1�(a, b)�0 +class: D1(a, b) +D2�1�(a, b)�0 +class: D2(a, b) +D2A�1�(a, b)�0 +class: D2A(a, b) +D3�1�0 +class: D3 +D4�1�0 +class: D4 +D5�1�(myOperator)�0 +class: D5(myOperator) +DT1�1�()�0 +class: DT1() +DT2�1�(message)�0 +class: DT2(message) +DT2A�1�(message)�0 +class: DT2A(message) +DT3�1�()�0 +class: DT3() DT4�1�(message, specifiedName)�0 class: DT4(message, specifiedName) DT5�1�(color, specifiedName, owner, weight)�0 @@ -36,26 +36,28 @@ DT8 class: DT8(name, salary) DT9�1�(name, salary)�0 class: DT9(name, salary) -PT1�16�()�0 -function: PT1() +PT1�1�()�0 +class: PT1() PT2�1�(name, color)�0 class: PT2(name, color) PT3�1�(name, salary)�0 class: PT3(name, salary) add�16�(a,b)�myObject�0 function: myObject :: add(a,b) +add�16384�0 +variable: add addSalary�128�(addition)�PT3�0 method: PT3 :: addSalary(addition) -addSalaryFunction�1�(addition)�0 -class: addSalaryFunction(addition) -addSalaryFunctionDT9�1�(addition)�0 -class: addSalaryFunctionDT9(addition) +addSalaryFunction�16�(addition)�0 +function: addSalaryFunction(addition) +addSalaryFunctionDT9�16�(addition)�0 +function: addSalaryFunctionDT9(addition) ball0�16384�0 variable: ball0 ball1�16384�0 variable: ball1 -ball2�1�0 -class: ball2 +ball2�16384�0 +variable: ball2 ball3�16384�0 variable: ball3 ball4�16384�0 @@ -104,6 +106,8 @@ livesIn method: PT2 :: livesIn manager�16384�0 variable: manager +multiply�16384�0 +variable: multiply myFunction4�16�(message)�0 function: myFunction4(message) myFunction5�16�()�0 @@ -118,22 +122,36 @@ myFunction6B function: myFunction6B() myFunction6E�16�()�0 function: myFunction6E() -myObject�1�0 -class: myObject +myObject�16384�0 +variable: myObject my_global_var1�16384�0 variable: my_global_var1 -object1�1�0 -class: object1 -object2�1�0 -class: object2 -object3�1�0 -class: object3 +object1�16384�0 +variable: object1 +object2�16384�0 +variable: object2 +object3�16384�0 +variable: object3 price�128�PT2�0 method: PT2 :: price +ptr�16384�0 +variable: ptr +ptr1�16384�0 +variable: ptr1 +ptr2�16384�0 +variable: ptr2 +resultString�16384�0 +variable: resultString +savedFunc�16384�0 +variable: savedFunc savedFunc6B�16�()�0 function: savedFunc6B() +savedFunction�16384�0 +variable: savedFunction sayName4A�16�(name)�0 function: sayName4A(name) +subtract�16384�0 +variable: subtract teamLeader�16384�0 variable: teamLeader theAdd�16�(a, b)�0

Modified: tests/ctags/parenthesis-rvalue.js.tags 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -26,10 +26,10 @@ c1 variable: c1 c2�16384�0 variable: c2 -d1�1�0 -class: d1 -d2�1�0 -class: d2 +d1�16384�0 +variable: d1 +d2�16384�0 +variable: d2 e1�16�()�0 function: e1() e1sub�16�()�e1�0

Modified: tests/ctags/secondary_fcn_name.js.tags 12 lines changed, 6 insertions(+), 6 deletions(-) =================================================================== @@ -1,9 +1,9 @@ -D1�16�(a, b)�0 -function: D1(a, b) -D2�16�(a, b)�0 -function: D2(a, b) -D2A�16�(a, b)�0 -function: D2A(a, b) +D1�1�(a, b)�0 +class: D1(a, b) +D2�1�(a, b)�0 +class: D2(a, b) +D2A�1�(a, b)�0 +class: D2A(a, b) my_global_var1�16384�0 variable: my_global_var1 theAdd�16�(a, b)�0

Modified: tests/ctags/simple.js.tags 10 lines changed, 6 insertions(+), 4 deletions(-) =================================================================== @@ -6,8 +6,12 @@ ValidClassTwo class: ValidClassTwo() calculate�16�(number)�getHalfOf�0 function: getHalfOf :: calculate(number) +core�16384�testlib�0 +variable: testlib :: core executeQueryString�128�Database�0 method: Database :: executeQueryString +extras�1�testlib�0 +class: testlib :: extras getHalfOf�16�(num1, num2, num3)�0 function: getHalfOf(num1, num2, num3) getTodaysDate�128�Database�0 @@ -18,8 +22,6 @@ invalidInnerFunction function: invalidInnerFunction(a,b) my_global_var1�16384�0 variable: my_global_var1 -my_global_var2�16384�0 -variable: my_global_var2 my_global_var3�16384�0 variable: my_global_var3 my_global_var4�16384�0 @@ -28,10 +30,10 @@ onchange function: my_global_var4 :: onchange() originalvalue�16384�0 variable: originalvalue +testlib�16384�0 +variable: testlib validFunctionFive�16�(a,b)�testlib�0 function: testlib :: validFunctionFive(a,b) -validFunctionFour�16�(a,b)�extra�0 -function: extra :: validFunctionFour(a,b) validFunctionOne�16�(a,b)�0 function: validFunctionOne(a,b) validFunctionSix�16�(a,b)�testlib.core�0

Modified: tests/ctags/ui5.controller.js.tags 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,5 @@ +app.my_form�1�0 +class: app.my_form onInit�128�()�app.my_form�0 method: app.my_form :: onInit() refreshForm�128�(AUFNR)�app.my_form�0

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