Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Sat, 31 Jan 2015 21:15:18 UTC Commit: 270e32327f4d9776afb2047108da8550afbf3f83 https://github.com/geany/geany/commit/270e32327f4d9776afb2047108da8550afbf3f...
Log Message: ----------- json: Enable tag parser and adapt test case for Geany
Modified Paths: -------------- data/filetypes.JSON.conf tagmanager/ctags/json.c tests/ctags/Makefile.am tests/ctags/simple.json.tags
Modified: data/filetypes.JSON.conf 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -5,6 +5,7 @@ primary=true false null
[settings] lexer_filetype=Javascript +tag_parser=JSON extension=json mime_type=application/json
Modified: tagmanager/ctags/json.c 12 lines changed, 6 insertions(+), 6 deletions(-) =================================================================== @@ -69,12 +69,12 @@ typedef enum { static langType Lang_json;
static kindOption JsonKinds [] = { - { TRUE, 'o', "object", "objects" }, - { TRUE, 'a', "array", "arrays" }, - { TRUE, 'n', "number", "numbers" }, - { TRUE, 's', "string", "strings" }, - { TRUE, 'b', "boolean", "booleans" }, - { TRUE, 'z', "null", "nulls" } + { TRUE, 'o', "member", "objects" }, + { TRUE, 'a', "member", "arrays" }, + { TRUE, 'n', "member", "numbers" }, + { TRUE, 's', "member", "strings" }, + { TRUE, 'b', "member", "booleans" }, + { TRUE, 'z', "member", "nulls" } };
static tokenInfo *newToken (void)
Modified: tests/ctags/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -246,6 +246,7 @@ test_sources = \ simple.d \ simple.html \ simple.js \ + simple.json \ simple.ksh \ simple.lua \ simple.mak \
Modified: tests/ctags/simple.json.tags 39 lines changed, 20 insertions(+), 19 deletions(-) =================================================================== @@ -1,19 +1,20 @@ -0 input.json /^ {$/;" o array:phoneNumbers -1 input.json /^ {$/;" o array:phoneNumbers -address input.json /^ "address": {$/;" o -age input.json /^ "age": 25,$/;" n -children input.json /^ "children": [],$/;" a -city input.json /^ "city": "New York",$/;" s object:address -firstName input.json /^ "firstName": "John",$/;" s -height_cm input.json /^ "height_cm": 167.6,$/;" n -isAlive input.json /^ "isAlive": true,$/;" b -lastName input.json /^ "lastName": "Smith",$/;" s -number input.json /^ "number": "212 555-1234"$/;" s object:phoneNumbers.0 -number input.json /^ "number": "646 555-4567"$/;" s object:phoneNumbers.1 -phoneNumbers input.json /^ "phoneNumbers": [$/;" a -postalCode input.json /^ "postalCode": "10021-3100"$/;" s object:address -spouse input.json /^ "spouse": null$/;" z -state input.json /^ "state": "NY",$/;" s object:address -streetAddress input.json /^ "streetAddress": "21 2nd Street",$/;" s object:address -type input.json /^ "type": "home",$/;" s object:phoneNumbers.0 -type input.json /^ "type": "office",$/;" s object:phoneNumbers.1 +# format=tagmanager +0�64�phoneNumbers�0 +1�64�phoneNumbers�0 +address�64�0 +age�64�0 +children�64�0 +city�64�address�0 +firstName�64�0 +height_cm�64�0 +isAlive�64�0 +lastName�64�0 +number�64�phoneNumbers.0�0 +number�64�phoneNumbers.1�0 +phoneNumbers�64�0 +postalCode�64�address�0 +spouse�64�0 +state�64�address�0 +streetAddress�64�address�0 +type�64�phoneNumbers.0�0 +type�64�phoneNumbers.1�0
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).