Commits February 2015

commits@lists.geany.org

1 participants
43 discussions

[geany/geany] 1c1d76: Fix several tooltips to properly use plain text instead of markup
by Colomban Wendling 28 Feb '15

28 Feb '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 28 Feb 2015 18:15:00 UTC Commit: 1c1d76721dddf56bb9b5aa07f4513ea7e64554b4 https://github.com/geany/geany/commit/1c1d76721dddf56bb9b5aa07f4513ea7e6455… Log Message: ----------- Fix several tooltips to properly use plain text instead of markup Most of our tree view tooltips were set from plain text values but parsed as markup by GTK, which sometimes lead to markup errors, when the tooltip value contained markup control characters. This also adds ui_tree_view_set_tooltip_text_column() to the plugin API so plugins can easily set plain text tooltips from tree views columns. Fixes https://sourceforge.net/p/geany/bugs/1091/ Modified Paths: -------------- plugins/filebrowser.c plugins/geanyfunctions.h src/plugindata.h src/plugins.c src/sidebar.c src/symbols.c src/tools.c src/ui_utils.c src/ui_utils.h Modified: plugins/filebrowser.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -850,7 +850,7 @@ static void prepare_file_view(void) ui_widget_modify_font_from_string(file_view, geany->interface_prefs->tagbar_font); /* tooltips */ - gtk_tree_view_set_tooltip_column(GTK_TREE_VIEW(file_view), FILEVIEW_COLUMN_FILENAME); + ui_tree_view_set_tooltip_text_column(GTK_TREE_VIEW(file_view), FILEVIEW_COLUMN_FILENAME); /* selection handling */ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(file_view)); Modified: plugins/geanyfunctions.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -308,6 +308,8 @@ geany_functions->p_ui->ui_menu_add_document_items_sorted #define ui_lookup_stock_label \ geany_functions->p_ui->ui_lookup_stock_label +#define ui_tree_view_set_tooltip_text_column \ + geany_functions->p_ui->ui_tree_view_set_tooltip_text_column #define dialogs_show_question \ geany_functions->p_dialogs->dialogs_show_question #define dialogs_show_msgbox \ Modified: src/plugindata.h 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -58,7 +58,7 @@ G_BEGIN_DECLS * @warning You should not test for values below 200 as previously * @c GEANY_API_VERSION was defined as an enum value, not a macro. */ -#define GEANY_API_VERSION 222 +#define GEANY_API_VERSION 223 /* hack to have a different ABI when built with GTK3 because loading GTK2-linked plugins * with GTK3-linked Geany leads to crash */ @@ -501,6 +501,7 @@ typedef struct UIUtilsFuncs void (*ui_menu_add_document_items_sorted) (GtkMenu *menu, struct GeanyDocument *active, GCallback callback, GCompareFunc compare_func); const gchar* (*ui_lookup_stock_label)(const gchar *stock_id); + void (*ui_tree_view_set_tooltip_text_column) (GtkTreeView *tree_view, gint column); } UIUtilsFuncs; Modified: src/plugins.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -247,7 +247,8 @@ static UIUtilsFuncs uiutils_funcs = { &ui_get_gtk_settings_integer, &ui_combo_box_add_to_history, &ui_menu_add_document_items_sorted, - &ui_lookup_stock_label + &ui_lookup_stock_label, + &ui_tree_view_set_tooltip_text_column }; static DialogFuncs dialog_funcs = { Modified: src/sidebar.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -142,7 +142,7 @@ static void prepare_taglist(GtkWidget *tree, GtkTreeStore *store) if (! interface_prefs.show_symbol_list_expanders) gtk_tree_view_set_level_indentation(GTK_TREE_VIEW(tree), 10); /* Tooltips */ - gtk_tree_view_set_tooltip_column(GTK_TREE_VIEW(tree), SYMBOLS_COLUMN_TOOLTIP); + ui_tree_view_set_tooltip_text_column(GTK_TREE_VIEW(tree), SYMBOLS_COLUMN_TOOLTIP); /* selection handling */ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree)); @@ -312,7 +312,7 @@ static void prepare_openfiles(void) ui_widget_modify_font_from_string(tv.tree_openfiles, interface_prefs.tagbar_font); /* tooltips */ - gtk_tree_view_set_tooltip_column(GTK_TREE_VIEW(tv.tree_openfiles), DOCUMENTS_FILENAME); + ui_tree_view_set_tooltip_text_column(GTK_TREE_VIEW(tv.tree_openfiles), DOCUMENTS_FILENAME); /* selection handling */ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv.tree_openfiles)); Modified: src/symbols.c 3 lines changed, 0 insertions(+), 3 deletions(-) =================================================================== @@ -1048,9 +1048,6 @@ static gchar *get_symbol_tooltip(GeanyDocument *doc, const TMTag *tag) encodings_convert_to_utf8_from_charset(utf8_name, -1, doc->encoding, TRUE)); } - if (utf8_name != NULL) - SETPTR(utf8_name, g_markup_escape_text(utf8_name, -1)); - return utf8_name; } Modified: src/tools.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -563,7 +563,7 @@ static void cc_show_dialog_custom_commands(void) cc.store = gtk_list_store_new(CC_COLUMN_COUNT, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); cc.view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(cc.store)); - gtk_tree_view_set_tooltip_column(GTK_TREE_VIEW(cc.view), CC_COLUMN_TOOLTIP); + ui_tree_view_set_tooltip_text_column(GTK_TREE_VIEW(cc.view), CC_COLUMN_TOOLTIP); gtk_tree_view_set_reorderable(GTK_TREE_VIEW(cc.view), TRUE); cc.selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(cc.view)); /* ID column */ Modified: src/ui_utils.c 61 lines changed, 61 insertions(+), 0 deletions(-) =================================================================== @@ -1806,6 +1806,67 @@ gboolean ui_tree_view_find_previous(GtkTreeView *treeview, TVMatchCallback cb) } +/* Shamelessly stolen from GTK */ +static gboolean ui_tree_view_query_tooltip_cb(GtkWidget *widget, gint x, gint y, + gboolean keyboard_tip, GtkTooltip *tooltip, gpointer data) +{ + GValue value = G_VALUE_INIT; + GValue transformed = G_VALUE_INIT; + GtkTreeIter iter; + GtkTreePath *path; + GtkTreeModel *model; + GtkTreeView *tree_view = GTK_TREE_VIEW(widget); + gint column = GPOINTER_TO_INT(data); + gboolean tootlip_set = FALSE; + + if (! gtk_tree_view_get_tooltip_context(tree_view, &x, &y, keyboard_tip, &model, &path, &iter)) + return FALSE; + + gtk_tree_model_get_value(model, &iter, column, &value); + + g_value_init(&transformed, G_TYPE_STRING); + if (g_value_transform(&value, &transformed) && g_value_get_string(&transformed)) + { + gtk_tooltip_set_text(tooltip, g_value_get_string(&transformed)); + gtk_tree_view_set_tooltip_row(tree_view, tooltip, path); + tootlip_set = TRUE; + } + + g_value_unset(&transformed); + g_value_unset(&value); + gtk_tree_path_free(path); + + return tootlip_set; +} + + +/** Adds text tooltips to a tree view. + * + * This is similar to gtk_tree_view_set_tooltip_column() but considers the column contents to be + * text, not markup -- it uses gtk_tooltip_set_text() rather than gtk_tooltip_set_markup() to set + * the tooltip's value. + * + * @warning Unlike gtk_tree_view_set_tooltip_column() you currently cannot change or remove the + * tooltip column after it has been added. Trying to do so will probably give funky results. + * + * @param tree_view The tree view + * @param column The column to get the tooltip from + * + * @since 1.25 (API 223) + */ +/* Note: @p column is int and not uint both to match gtk_tree_view_set_tooltip_column() signature + * and to allow future support of -1 to unset if ever wanted */ +void ui_tree_view_set_tooltip_text_column(GtkTreeView *tree_view, gint column) +{ + g_return_if_fail(column >= 0); + g_return_if_fail(GTK_IS_TREE_VIEW(tree_view)); + + g_signal_connect(tree_view, "query-tooltip", + G_CALLBACK(ui_tree_view_query_tooltip_cb), GINT_TO_POINTER(column)); + gtk_widget_set_has_tooltip(GTK_WIDGET(tree_view), TRUE); +} + + /** * Modifies the font of a widget using gtk_widget_modify_font(). * Modified: src/ui_utils.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -139,6 +139,8 @@ void ui_combo_box_add_to_history(GtkComboBoxText *combo_entry, const gchar *ui_lookup_stock_label(const gchar *stock_id); +void ui_tree_view_set_tooltip_text_column(GtkTreeView *tree_view, gint column); + #ifdef GEANY_PRIVATE -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] cc6602: autotools: Install to $prefix/data on win32
by Thomas Martitz 25 Feb '15

25 Feb '15

Branch: refs/heads/master Author: Thomas Martitz <kugel(a)rockbox.org> Committer: Thomas Martitz <kugel(a)rockbox.org> Date: Wed, 25 Feb 2015 08:23:12 UTC Commit: cc6602c2b6096739c8a3d5dad51b35885e31b895 https://github.com/geany/geany/commit/cc6602c2b6096739c8a3d5dad51b35885e31b… Log Message: ----------- autotools: Install to $prefix/data on win32 setup_paths() sets app->datadir to $prefix/win32. With mingw-via-autotools, it installed data to $prefix/share/geany (like on Linux). With this change data is installed to $prefix/data ($datarootdir is not changed). This fixes geany startup after make install with autotools. Linux: pkgdatadir = ${datarootdir}/geany GEANY_DATA_DIR = /path/to/prefix/share/geany Win32: pkgdatadir = ${prefix}/data GEANY_DATA_DIR = /path/to/prefix/data Modified Paths: -------------- configure.ac Modified: configure.ac 8 lines changed, 6 insertions(+), 2 deletions(-) =================================================================== @@ -110,8 +110,12 @@ GEANY_CHECK_THE_FORCE dnl hehe # i18n GEANY_I18N -GEANY_DATA_DIR=`eval echo ${datarootdir}/geany` -AC_SUBST([GEANY_DATA_DIR]) +# double eval since datarootdir is usually defined as ${prefix}/share +AM_COND_IF([MINGW], + [pkgdatadir='${prefix}/data'], + [pkgdatadir='${datarootdir}/geany']) +AC_SUBST([GEANY_DATA_DIR], [$(eval echo $(eval echo $pkgdatadir))]) +AC_SUBST([pkgdatadir]) # Documentation tools GEANY_CHECK_DOCUTILS -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] e454b8: Merge branch 'json-tag-parser' into json
by Colomban Wendling 24 Feb '15

24 Feb '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 31 Jan 2015 21:17:26 UTC Commit: e454b8962cdb68cf8d41813ffc55a1a620925845 https://github.com/geany/geany/commit/e454b8962cdb68cf8d41813ffc55a1a620925… Log Message: ----------- Merge branch 'json-tag-parser' into json Import JSON tag parser from CTags: https://github.com/fishman/ctags/blob/master/json.c Modified Paths: -------------- data/filetypes.JSON.conf tagmanager/ctags/Makefile.am tagmanager/ctags/json.c tagmanager/ctags/makefile.win32 tagmanager/ctags/parsers.h tagmanager/src/tm_parser.h tests/ctags/Makefile.am tests/ctags/simple.json tests/ctags/simple.json.tags wscript 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/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -29,6 +29,7 @@ parsers = \ haxe.c \ html.c \ js.c \ + json.c \ latex.c \ lregex.c \ lua.c \ Modified: tagmanager/ctags/json.c 400 lines changed, 400 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,400 @@ +/* + * Copyright (c) 2014, Colomban Wendling <colomban(a)geany.org> + * + * This source code is released for free distribution under the terms of the + * GNU General Public License. + */ +/* + * This module contains functions for generating tags for JSON files. + * + * http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf + * + * This implementation is forgiving and allows many constructs that are not + * actually valid but that don't conflict with the format. This is intend to + * better support partly broken or unfinished files. + */ + +#include "general.h" + +#include <string.h> +#include "main.h" +#include "entry.h" +#include "keyword.h" +#include "parse.h" +#include "read.h" +#include "vstring.h" + +typedef enum { + TOKEN_EOF, + TOKEN_UNDEFINED, + TOKEN_OPEN_SQUARE, + TOKEN_CLOSE_SQUARE, + TOKEN_OPEN_CURLY, + TOKEN_CLOSE_CURLY, + TOKEN_COLON, + TOKEN_COMMA, + TOKEN_TRUE, + TOKEN_FALSE, + TOKEN_NULL, + TOKEN_NUMBER, + TOKEN_STRING +} tokenType; + +typedef enum { + TAG_NONE = -1, + TAG_OBJECT, + TAG_ARRAY, + TAG_NUMBER, + TAG_STRING, + TAG_BOOLEAN, + TAG_NULL, + TAG_COUNT +} jsonKind; + +typedef struct { + tokenType type; + jsonKind scopeKind; + vString *string; + vString *scope; + unsigned long lineNumber; + MIOPos filePosition; +} tokenInfo; + +typedef enum { + KEYWORD_true, + KEYWORD_false, + KEYWORD_null +} keywordId; + +static langType Lang_json; + +static kindOption JsonKinds [] = { + { 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) +{ + tokenInfo *const token = xMalloc (1, tokenInfo); + + token->type = TOKEN_UNDEFINED; + token->scopeKind = TAG_NONE; + token->string = vStringNew (); + token->scope = vStringNew (); + token->lineNumber = getSourceLineNumber (); + token->filePosition = getInputFilePosition (); + + return token; +} + +static void deleteToken (tokenInfo *const token) +{ + vStringDelete (token->string); + vStringDelete (token->scope); + eFree (token); +} + +static void copyToken (tokenInfo *const dest, tokenInfo *const src) +{ + dest->type = src->type; + dest->scopeKind = src->scopeKind; + vStringCopy (dest->string, src->string); + vStringCopy (dest->scope, src->scope); + dest->lineNumber = src->lineNumber; + dest->filePosition = src->filePosition; +} + +static void makeJsonTag (tokenInfo *const token, const jsonKind kind) +{ + tagEntryInfo e; + + if (! JsonKinds[kind].enabled) + return; + + initTagEntry (&e, vStringValue (token->string)); + + e.lineNumber = token->lineNumber; + e.filePosition = token->filePosition; + e.kindName = JsonKinds[kind].name; + e.kind = JsonKinds[kind].letter; + + if (vStringLength (token->scope) > 0) + { + Assert (token->scopeKind > TAG_NONE && token->scopeKind < TAG_COUNT); + + e.extensionFields.scope[0] = JsonKinds[token->scopeKind].name; + e.extensionFields.scope[1] = vStringValue (token->scope); + } + + makeTagEntry (&e); +} + +static boolean isIdentChar (int c) +{ + return (isalnum (c) || c == '+' || c == '-' || c == '.'); +} + +static void readTokenFull (tokenInfo *const token, + boolean includeStringRepr) +{ + int c; + + token->type = TOKEN_UNDEFINED; + vStringClear (token->string); + + do + c = fileGetc (); + while (c == '\t' || c == ' ' || c == '\r' || c == '\n'); + + token->lineNumber = getSourceLineNumber (); + token->filePosition = getInputFilePosition (); + + switch (c) + { + case EOF: token->type = TOKEN_EOF; break; + case '[': token->type = TOKEN_OPEN_SQUARE; break; + case ']': token->type = TOKEN_CLOSE_SQUARE; break; + case '{': token->type = TOKEN_OPEN_CURLY; break; + case '}': token->type = TOKEN_CLOSE_CURLY; break; + case ':': token->type = TOKEN_COLON; break; + case ',': token->type = TOKEN_COMMA; break; + + case '"': + { + boolean escaped = FALSE; + token->type = TOKEN_STRING; + while (TRUE) + { + c = fileGetc (); + /* we don't handle unicode escapes but they are safe */ + if (escaped) + escaped = FALSE; + else if (c == '\\') + escaped = TRUE; + else if (c >= 0x00 && c <= 0x1F) + break; /* break on invalid, unescaped, control characters */ + else if (c == '"' || c == EOF) + break; + if (includeStringRepr) + vStringPut (token->string, c); + } + vStringTerminate (token->string); + break; + } + + default: + if (! isIdentChar (c)) + token->type = TOKEN_UNDEFINED; + else + { + do + { + vStringPut (token->string, c); + c = fileGetc (); + } + while (c != EOF && isIdentChar (c)); + vStringTerminate (token->string); + fileUngetc (c); + switch (lookupKeyword (vStringValue (token->string), Lang_json)) + { + case KEYWORD_true: token->type = TOKEN_TRUE; break; + case KEYWORD_false: token->type = TOKEN_FALSE; break; + case KEYWORD_null: token->type = TOKEN_NULL; break; + default: token->type = TOKEN_NUMBER; break; + } + } + break; + } +} + +#define readToken(t) (readTokenFull ((t), FALSE)) + +static void pushScope (tokenInfo *const token, + const tokenInfo *const parent, + const jsonKind parentKind) +{ + if (vStringLength (token->scope) > 0) + vStringPut (token->scope, '.'); + vStringCat (token->scope, parent->string); + vStringTerminate (token->scope); + token->scopeKind = parentKind; +} + +static void popScope (tokenInfo *const token, + const tokenInfo *const parent) +{ + char *dot = strrchr (token->scope->buffer, '.'); + + if (! dot) + vStringClear (token->scope); + else + { + *dot = 0; + token->scope->length = dot - token->scope->buffer; + } + token->scopeKind = parent->scopeKind; +} + +#define skipToOneOf2(token, type1, type2) \ + (skipToOneOf3 (token, type1, type2, TOKEN_EOF /* dummy */)) + +#define skipTo(token, type) \ + (skipToOneOf3 (token, type, /* dummies */ TOKEN_EOF, TOKEN_EOF)) + +static void skipToOneOf3 (tokenInfo *const token, + const tokenType type1, + const tokenType type2, + const tokenType type3) +{ + while (token->type != TOKEN_EOF && + token->type != type1 && + token->type != type2 && + token->type != type3) + { + readToken (token); + if (token->type == TOKEN_OPEN_CURLY) + { + skipTo (token, TOKEN_CLOSE_CURLY); + readToken (token); + } + else if (token->type == TOKEN_OPEN_SQUARE) + { + skipTo (token, TOKEN_CLOSE_SQUARE); + readToken (token); + } + } +} + +static jsonKind tokenToKind (const tokenType type) +{ + switch (type) + { + case TOKEN_OPEN_CURLY: return TAG_OBJECT; + case TOKEN_OPEN_SQUARE: return TAG_ARRAY; + case TOKEN_STRING: return TAG_STRING; + case TOKEN_TRUE: + case TOKEN_FALSE: return TAG_BOOLEAN; + case TOKEN_NUMBER: return TAG_NUMBER; + default: return TAG_NULL; + } +} + +static void parseValue (tokenInfo *const token) +{ + if (token->type == TOKEN_OPEN_CURLY) + { + tokenInfo *name = newToken (); + + do + { + readTokenFull (token, TRUE); + if (token->type == TOKEN_STRING) + { + jsonKind tagKind = TAG_NULL; /* default in case of invalid value */ + + copyToken (name, token); + + /* skip any possible garbage before the value */ + skipToOneOf3 (token, TOKEN_CLOSE_CURLY, TOKEN_COLON, TOKEN_COMMA); + + if (token->type == TOKEN_COLON) + { + readToken (token); + tagKind = tokenToKind (token->type); + + pushScope (token, name, tagKind); + parseValue (token); + popScope (token, name); + } + + makeJsonTag (name, tagKind); + } + /* skip to the end of the construct */ + skipToOneOf2 (token, TOKEN_CLOSE_CURLY, TOKEN_COMMA); + } + while (token->type != TOKEN_EOF && + token->type != TOKEN_CLOSE_CURLY); + + if (token->type == TOKEN_CLOSE_CURLY) + readToken (token); + + deleteToken (name); + } + else if (token->type == TOKEN_OPEN_SQUARE) + { + tokenInfo *name = newToken (); + char buf[32]; + unsigned int nth = 0; + + readToken (token); + while (token->type != TOKEN_EOF && + token->type != TOKEN_CLOSE_SQUARE) + { + jsonKind tagKind; + + tagKind = tokenToKind (token->type); + + copyToken (name, token); + snprintf (buf, sizeof buf, "%u", nth++); + vStringCopyS (name->string, buf); + + makeJsonTag (name, tagKind); + pushScope (token, name, tagKind); + parseValue (token); + popScope (token, name); + + /* skip to the end of the construct */ + skipToOneOf2 (token, TOKEN_CLOSE_SQUARE, TOKEN_COMMA); + if (token->type != TOKEN_CLOSE_SQUARE) + readToken (token); + } + + if (token->type == TOKEN_CLOSE_SQUARE) + readToken (token); + + deleteToken (name); + } +} + +static void findJsonTags (void) +{ + tokenInfo *const token = newToken (); + + /* We allow multiple top-level elements, although it's not actually valid + * JSON. An interesting side effect of this is that we allow a leading + * Unicode BOM mark -- even though ok, many JSON parsers will choke on it */ + do + { + readToken (token); + parseValue (token); + } + while (token->type != TOKEN_EOF); + + deleteToken (token); +} + +static void initialize (const langType language) +{ + Lang_json = language; + addKeyword ("true", language, KEYWORD_true); + addKeyword ("false", language, KEYWORD_false); + addKeyword ("null", language, KEYWORD_null); +} + +/* Create parser definition stucture */ +extern parserDefinition* JsonParser (void) +{ + static const char *const extensions [] = { "json", NULL }; + parserDefinition *const def = parserNew ("JSON"); + def->extensions = extensions; + def->kinds = JsonKinds; + def->kindCount = KIND_COUNT (JsonKinds); + def->parser = findJsonTags; + def->initialize = initialize; + + return def; +} Modified: tagmanager/ctags/makefile.win32 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -44,7 +44,7 @@ all: $(COMPLIB) clean: -$(RM) deps.mak *.o $(COMPLIB) -$(COMPLIB): abaqus.o abc.o args.o c.o cobol.o fortran.o make.o conf.o pascal.o perl.o php.o diff.o vhdl.o verilog.o lua.o js.o \ +$(COMPLIB): abaqus.o abc.o args.o c.o cobol.o fortran.o make.o conf.o pascal.o perl.o php.o diff.o vhdl.o verilog.o lua.o js.o json.o \ actionscript.o nsis.o objc.o \ haskell.o haxe.o html.o python.o lregex.o asciidoc.o rest.o sh.o ctags.o entry.o get.o keyword.o nestlevel.o \ options.o \ Modified: tagmanager/ctags/parsers.h 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -62,7 +62,8 @@ AsciidocParser, \ AbaqusParser, \ RustParser, \ - GoParser + GoParser, \ + JsonParser #endif /* _PARSERS_H */ Modified: tagmanager/src/tm_parser.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -69,6 +69,7 @@ typedef enum TM_PARSER_ABAQUS, TM_PARSER_RUST, TM_PARSER_GO, + TM_PARSER_JSON, TM_PARSER_COUNT } TMParserType; 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 25 lines changed, 25 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,25 @@ +{ + "firstName": "John", + "lastName": "Smith", + "isAlive": true, + "age": 25, + "height_cm": 167.6, + "address": { + "streetAddress": "21 2nd Street", + "city": "New York", + "state": "NY", + "postalCode": "10021-3100" + }, + "phoneNumbers": [ + { + "type": "home", + "number": "212 555-1234" + }, + { + "type": "office", + "number": "646 555-4567" + } + ], + "children": [], + "spouse": null +} Modified: tests/ctags/simple.json.tags 20 lines changed, 20 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,20 @@ +# 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 Modified: wscript 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -87,6 +87,7 @@ ctags_sources = set([ 'tagmanager/ctags/haxe.c', 'tagmanager/ctags/html.c', 'tagmanager/ctags/js.c', + 'tagmanager/ctags/json.c', 'tagmanager/ctags/keyword.c', 'tagmanager/ctags/latex.c', 'tagmanager/ctags/lregex.c', -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 0bd958: json: Optimize memory usage by not collecting string values
by Colomban Wendling 24 Feb '15

24 Feb '15

1 0

[geany/geany] 270e32: json: Enable tag parser and adapt test case for Geany
by Colomban Wendling 24 Feb '15

24 Feb '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 31 Jan 2015 21:15:18 UTC Commit: 270e32327f4d9776afb2047108da8550afbf3f83 https://github.com/geany/geany/commit/270e32327f4d9776afb2047108da8550afbf3… 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).

1 0

[geany/geany] 2ff138: Add new parser for JSON
by Colomban Wendling 24 Feb '15

24 Feb '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 31 Jan 2015 21:14:50 UTC Commit: 2ff1386d9690147af9d5089d319dd57aca044151 https://github.com/geany/geany/commit/2ff1386d9690147af9d5089d319dd57aca044… Log Message: ----------- Add new parser for JSON Modified Paths: -------------- tagmanager/ctags/Makefile.am tagmanager/ctags/json.c tagmanager/ctags/makefile.win32 tagmanager/ctags/parsers.h tagmanager/src/tm_parser.h tests/ctags/simple.json tests/ctags/simple.json.tags wscript Modified: tagmanager/ctags/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -29,6 +29,7 @@ parsers = \ haxe.c \ html.c \ js.c \ + json.c \ latex.c \ lregex.c \ lua.c \ Modified: tagmanager/ctags/json.c 396 lines changed, 396 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,396 @@ +/* + * Copyright (c) 2014, Colomban Wendling <colomban(a)geany.org> + * + * This source code is released for free distribution under the terms of the + * GNU General Public License. + */ +/* + * This module contains functions for generating tags for JSON files. + * + * http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf + * + * This implementation is forgiving and allows many constructs that are not + * actually valid but that don't conflict with the format. This is intend to + * better support partly broken or unfinished files. + */ + +#include "general.h" + +#include <string.h> +#include "main.h" +#include "entry.h" +#include "keyword.h" +#include "parse.h" +#include "read.h" +#include "vstring.h" + +typedef enum { + TOKEN_EOF, + TOKEN_UNDEFINED, + TOKEN_OPEN_SQUARE, + TOKEN_CLOSE_SQUARE, + TOKEN_OPEN_CURLY, + TOKEN_CLOSE_CURLY, + TOKEN_COLON, + TOKEN_COMMA, + TOKEN_TRUE, + TOKEN_FALSE, + TOKEN_NULL, + TOKEN_NUMBER, + TOKEN_STRING +} tokenType; + +typedef enum { + TAG_NONE = -1, + TAG_OBJECT, + TAG_ARRAY, + TAG_NUMBER, + TAG_STRING, + TAG_BOOLEAN, + TAG_NULL, + TAG_COUNT +} jsonKind; + +typedef struct { + tokenType type; + jsonKind scopeKind; + vString *string; + vString *scope; + unsigned long lineNumber; + MIOPos filePosition; +} tokenInfo; + +typedef enum { + KEYWORD_true, + KEYWORD_false, + KEYWORD_null +} keywordId; + +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" } +}; + +static tokenInfo *newToken (void) +{ + tokenInfo *const token = xMalloc (1, tokenInfo); + + token->type = TOKEN_UNDEFINED; + token->scopeKind = TAG_NONE; + token->string = vStringNew (); + token->scope = vStringNew (); + token->lineNumber = getSourceLineNumber (); + token->filePosition = getInputFilePosition (); + + return token; +} + +static void deleteToken (tokenInfo *const token) +{ + vStringDelete (token->string); + vStringDelete (token->scope); + eFree (token); +} + +static void copyToken (tokenInfo *const dest, tokenInfo *const src) +{ + dest->type = src->type; + dest->scopeKind = src->scopeKind; + vStringCopy (dest->string, src->string); + vStringCopy (dest->scope, src->scope); + dest->lineNumber = src->lineNumber; + dest->filePosition = src->filePosition; +} + +static void makeJsonTag (tokenInfo *const token, const jsonKind kind) +{ + tagEntryInfo e; + + if (! JsonKinds[kind].enabled) + return; + + initTagEntry (&e, vStringValue (token->string)); + + e.lineNumber = token->lineNumber; + e.filePosition = token->filePosition; + e.kindName = JsonKinds[kind].name; + e.kind = JsonKinds[kind].letter; + + if (vStringLength (token->scope) > 0) + { + Assert (token->scopeKind > TAG_NONE && token->scopeKind < TAG_COUNT); + + e.extensionFields.scope[0] = JsonKinds[token->scopeKind].name; + e.extensionFields.scope[1] = vStringValue (token->scope); + } + + makeTagEntry (&e); +} + +static boolean isIdentChar (int c) +{ + return (isalnum (c) || c == '+' || c == '-' || c == '.'); +} + +static void readToken (tokenInfo *const token) +{ + int c; + + token->type = TOKEN_UNDEFINED; + vStringClear (token->string); + + do + c = fileGetc (); + while (c == '\t' || c == ' ' || c == '\r' || c == '\n'); + + token->lineNumber = getSourceLineNumber (); + token->filePosition = getInputFilePosition (); + + switch (c) + { + case EOF: token->type = TOKEN_EOF; break; + case '[': token->type = TOKEN_OPEN_SQUARE; break; + case ']': token->type = TOKEN_CLOSE_SQUARE; break; + case '{': token->type = TOKEN_OPEN_CURLY; break; + case '}': token->type = TOKEN_CLOSE_CURLY; break; + case ':': token->type = TOKEN_COLON; break; + case ',': token->type = TOKEN_COMMA; break; + + case '"': + { + boolean escaped = FALSE; + token->type = TOKEN_STRING; + while (TRUE) + { + c = fileGetc (); + /* we don't handle unicode escapes but they are safe */ + if (escaped) + escaped = FALSE; + else if (c == '\\') + escaped = TRUE; + else if (c >= 0x00 && c <= 0x1F) + break; /* break on invalid, unescaped, control characters */ + else if (c == '"' || c == EOF) + break; + vStringPut (token->string, c); + } + vStringTerminate (token->string); + break; + } + + default: + if (! isIdentChar (c)) + token->type = TOKEN_UNDEFINED; + else + { + do + { + vStringPut (token->string, c); + c = fileGetc (); + } + while (c != EOF && isIdentChar (c)); + vStringTerminate (token->string); + fileUngetc (c); + switch (lookupKeyword (vStringValue (token->string), Lang_json)) + { + case KEYWORD_true: token->type = TOKEN_TRUE; break; + case KEYWORD_false: token->type = TOKEN_FALSE; break; + case KEYWORD_null: token->type = TOKEN_NULL; break; + default: token->type = TOKEN_NUMBER; break; + } + } + break; + } +} + +static void pushScope (tokenInfo *const token, + const tokenInfo *const parent, + const jsonKind parentKind) +{ + if (vStringLength (token->scope) > 0) + vStringPut (token->scope, '.'); + vStringCat (token->scope, parent->string); + vStringTerminate (token->scope); + token->scopeKind = parentKind; +} + +static void popScope (tokenInfo *const token, + const tokenInfo *const parent) +{ + char *dot = strrchr (token->scope->buffer, '.'); + + if (! dot) + vStringClear (token->scope); + else + { + *dot = 0; + token->scope->length = dot - token->scope->buffer; + } + token->scopeKind = parent->scopeKind; +} + +#define skipToOneOf2(token, type1, type2) \ + (skipToOneOf3 (token, type1, type2, TOKEN_EOF /* dummy */)) + +#define skipTo(token, type) \ + (skipToOneOf3 (token, type, /* dummies */ TOKEN_EOF, TOKEN_EOF)) + +static void skipToOneOf3 (tokenInfo *const token, + const tokenType type1, + const tokenType type2, + const tokenType type3) +{ + while (token->type != TOKEN_EOF && + token->type != type1 && + token->type != type2 && + token->type != type3) + { + readToken (token); + if (token->type == TOKEN_OPEN_CURLY) + { + skipTo (token, TOKEN_CLOSE_CURLY); + readToken (token); + } + else if (token->type == TOKEN_OPEN_SQUARE) + { + skipTo (token, TOKEN_CLOSE_SQUARE); + readToken (token); + } + } +} + +static jsonKind tokenToKind (const tokenType type) +{ + switch (type) + { + case TOKEN_OPEN_CURLY: return TAG_OBJECT; + case TOKEN_OPEN_SQUARE: return TAG_ARRAY; + case TOKEN_STRING: return TAG_STRING; + case TOKEN_TRUE: + case TOKEN_FALSE: return TAG_BOOLEAN; + case TOKEN_NUMBER: return TAG_NUMBER; + default: return TAG_NULL; + } +} + +static void parseValue (tokenInfo *const token) +{ + if (token->type == TOKEN_OPEN_CURLY) + { + tokenInfo *name = newToken (); + + do + { + readToken (token); + if (token->type == TOKEN_STRING) + { + jsonKind tagKind = TAG_NULL; /* default in case of invalid value */ + + copyToken (name, token); + + /* skip any possible garbage before the value */ + skipToOneOf3 (token, TOKEN_CLOSE_CURLY, TOKEN_COLON, TOKEN_COMMA); + + if (token->type == TOKEN_COLON) + { + readToken (token); + tagKind = tokenToKind (token->type); + + pushScope (token, name, tagKind); + parseValue (token); + popScope (token, name); + } + + makeJsonTag (name, tagKind); + } + /* skip to the end of the construct */ + skipToOneOf2 (token, TOKEN_CLOSE_CURLY, TOKEN_COMMA); + } + while (token->type != TOKEN_EOF && + token->type != TOKEN_CLOSE_CURLY); + + if (token->type == TOKEN_CLOSE_CURLY) + readToken (token); + + deleteToken (name); + } + else if (token->type == TOKEN_OPEN_SQUARE) + { + tokenInfo *name = newToken (); + char buf[32]; + unsigned int nth = 0; + + readToken (token); + while (token->type != TOKEN_EOF && + token->type != TOKEN_CLOSE_SQUARE) + { + jsonKind tagKind; + + tagKind = tokenToKind (token->type); + + copyToken (name, token); + snprintf (buf, sizeof buf, "%u", nth++); + vStringCopyS (name->string, buf); + + makeJsonTag (name, tagKind); + pushScope (token, name, tagKind); + parseValue (token); + popScope (token, name); + + /* skip to the end of the construct */ + skipToOneOf2 (token, TOKEN_CLOSE_SQUARE, TOKEN_COMMA); + if (token->type != TOKEN_CLOSE_SQUARE) + readToken (token); + } + + if (token->type == TOKEN_CLOSE_SQUARE) + readToken (token); + + deleteToken (name); + } +} + +static void findJsonTags (void) +{ + tokenInfo *const token = newToken (); + + /* We allow multiple top-level elements, although it's not actually valid + * JSON. An interesting side effect of this is that we allow a leading + * Unicode BOM mark -- even though ok, many JSON parsers will choke on it */ + do + { + readToken (token); + parseValue (token); + } + while (token->type != TOKEN_EOF); + + deleteToken (token); +} + +static void initialize (const langType language) +{ + Lang_json = language; + addKeyword ("true", language, KEYWORD_true); + addKeyword ("false", language, KEYWORD_false); + addKeyword ("null", language, KEYWORD_null); +} + +/* Create parser definition stucture */ +extern parserDefinition* JsonParser (void) +{ + static const char *const extensions [] = { "json", NULL }; + parserDefinition *const def = parserNew ("JSON"); + def->extensions = extensions; + def->kinds = JsonKinds; + def->kindCount = KIND_COUNT (JsonKinds); + def->parser = findJsonTags; + def->initialize = initialize; + + return def; +} Modified: tagmanager/ctags/makefile.win32 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -44,7 +44,7 @@ all: $(COMPLIB) clean: -$(RM) deps.mak *.o $(COMPLIB) -$(COMPLIB): abaqus.o abc.o args.o c.o cobol.o fortran.o make.o conf.o pascal.o perl.o php.o diff.o vhdl.o verilog.o lua.o js.o \ +$(COMPLIB): abaqus.o abc.o args.o c.o cobol.o fortran.o make.o conf.o pascal.o perl.o php.o diff.o vhdl.o verilog.o lua.o js.o json.o \ actionscript.o nsis.o objc.o \ haskell.o haxe.o html.o python.o lregex.o asciidoc.o rest.o sh.o ctags.o entry.o get.o keyword.o nestlevel.o \ options.o \ Modified: tagmanager/ctags/parsers.h 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -62,7 +62,8 @@ AsciidocParser, \ AbaqusParser, \ RustParser, \ - GoParser + GoParser, \ + JsonParser #endif /* _PARSERS_H */ Modified: tagmanager/src/tm_parser.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -69,6 +69,7 @@ typedef enum TM_PARSER_ABAQUS, TM_PARSER_RUST, TM_PARSER_GO, + TM_PARSER_JSON, TM_PARSER_COUNT } TMParserType; Modified: tests/ctags/simple.json 25 lines changed, 25 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,25 @@ +{ + "firstName": "John", + "lastName": "Smith", + "isAlive": true, + "age": 25, + "height_cm": 167.6, + "address": { + "streetAddress": "21 2nd Street", + "city": "New York", + "state": "NY", + "postalCode": "10021-3100" + }, + "phoneNumbers": [ + { + "type": "home", + "number": "212 555-1234" + }, + { + "type": "office", + "number": "646 555-4567" + } + ], + "children": [], + "spouse": null +} Modified: tests/ctags/simple.json.tags 19 lines changed, 19 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,19 @@ +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 Modified: wscript 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -87,6 +87,7 @@ ctags_sources = set([ 'tagmanager/ctags/haxe.c', 'tagmanager/ctags/html.c', 'tagmanager/ctags/js.c', + 'tagmanager/ctags/json.c', 'tagmanager/ctags/keyword.c', 'tagmanager/ctags/latex.c', 'tagmanager/ctags/lregex.c', -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] b0cf3b: Add JSON custom filetype
by Colomban Wendling 24 Feb '15

24 Feb '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 31 Jan 2015 19:27:07 UTC Commit: b0cf3b4e2ddaacc952c1683375965c9ff2e0d51e https://github.com/geany/geany/commit/b0cf3b4e2ddaacc952c1683375965c9ff2e0d… Log Message: ----------- Add JSON custom filetype Closes #384. Modified Paths: -------------- data/Makefile.am data/filetype_extensions.conf data/filetypes.JSON.conf Modified: data/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -41,6 +41,7 @@ filetypes = \ filetypes.html \ filetypes.java \ filetypes.javascript \ + filetypes.JSON.conf \ filetypes.latex \ filetypes.lisp \ filetypes.lua \ Modified: data/filetype_extensions.conf 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -38,6 +38,7 @@ Haxe=*.hx; HTML=*.htm;*.html;*.shtml;*.hta;*.htd;*.htt;*.cfm;*.tpl; Java=*.java;*.jsp; Javascript=*.js; +JSON=*.json; LaTeX=*.tex;*.sty;*.idx;*.ltx;*.latex;*.aux;*.bib; Lisp=*.lisp; Lua=*.lua; @@ -73,5 +74,5 @@ None=*; Programming=Clojure;CUDA;Cython;Genie;Scala; Script=Graphviz; Markup= -Misc= +Misc=JSON; None= Modified: data/filetypes.JSON.conf 14 lines changed, 14 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,14 @@ +[styling=C] + +[keywords] +primary=true false null + +[settings] +lexer_filetype=Javascript +extension=json +mime_type=application/json + +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] a8a2d1: Merge pull request #415 from b4n/json
by Colomban Wendling 24 Feb '15

24 Feb '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 24 Feb 2015 17:08:46 UTC Commit: a8a2d14711cd983f3ae094237c33dedb1821d72e https://github.com/geany/geany/commit/a8a2d14711cd983f3ae094237c33dedb1821d… Log Message: ----------- Merge pull request #415 from b4n/json Add JSON filetype (with tag parser) Modified Paths: -------------- data/Makefile.am data/filetype_extensions.conf data/filetypes.JSON.conf tagmanager/ctags/Makefile.am tagmanager/ctags/json.c tagmanager/ctags/makefile.win32 tagmanager/ctags/parsers.h tagmanager/src/tm_parser.h tests/ctags/Makefile.am tests/ctags/simple.json tests/ctags/simple.json.tags wscript Modified: data/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -41,6 +41,7 @@ filetypes = \ filetypes.html \ filetypes.java \ filetypes.javascript \ + filetypes.JSON.conf \ filetypes.latex \ filetypes.lisp \ filetypes.lua \ Modified: data/filetype_extensions.conf 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -38,6 +38,7 @@ Haxe=*.hx; HTML=*.htm;*.html;*.shtml;*.hta;*.htd;*.htt;*.cfm;*.tpl; Java=*.java;*.jsp; Javascript=*.js; +JSON=*.json; LaTeX=*.tex;*.sty;*.idx;*.ltx;*.latex;*.aux;*.bib; Lisp=*.lisp; Lua=*.lua; @@ -73,5 +74,5 @@ None=*; Programming=Clojure;CUDA;Cython;Genie;Scala; Script=Graphviz; Markup= -Misc= +Misc=JSON; None= Modified: data/filetypes.JSON.conf 15 lines changed, 15 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,15 @@ +[styling=C] + +[keywords] +primary=true false null + +[settings] +lexer_filetype=Javascript +tag_parser=JSON +extension=json +mime_type=application/json + +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 Modified: tagmanager/ctags/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -29,6 +29,7 @@ parsers = \ haxe.c \ html.c \ js.c \ + json.c \ latex.c \ lregex.c \ lua.c \ Modified: tagmanager/ctags/json.c 400 lines changed, 400 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,400 @@ +/* + * Copyright (c) 2014, Colomban Wendling <colomban(a)geany.org> + * + * This source code is released for free distribution under the terms of the + * GNU General Public License. + */ +/* + * This module contains functions for generating tags for JSON files. + * + * http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf + * + * This implementation is forgiving and allows many constructs that are not + * actually valid but that don't conflict with the format. This is intend to + * better support partly broken or unfinished files. + */ + +#include "general.h" + +#include <string.h> +#include "main.h" +#include "entry.h" +#include "keyword.h" +#include "parse.h" +#include "read.h" +#include "vstring.h" + +typedef enum { + TOKEN_EOF, + TOKEN_UNDEFINED, + TOKEN_OPEN_SQUARE, + TOKEN_CLOSE_SQUARE, + TOKEN_OPEN_CURLY, + TOKEN_CLOSE_CURLY, + TOKEN_COLON, + TOKEN_COMMA, + TOKEN_TRUE, + TOKEN_FALSE, + TOKEN_NULL, + TOKEN_NUMBER, + TOKEN_STRING +} tokenType; + +typedef enum { + TAG_NONE = -1, + TAG_OBJECT, + TAG_ARRAY, + TAG_NUMBER, + TAG_STRING, + TAG_BOOLEAN, + TAG_NULL, + TAG_COUNT +} jsonKind; + +typedef struct { + tokenType type; + jsonKind scopeKind; + vString *string; + vString *scope; + unsigned long lineNumber; + MIOPos filePosition; +} tokenInfo; + +typedef enum { + KEYWORD_true, + KEYWORD_false, + KEYWORD_null +} keywordId; + +static langType Lang_json; + +static kindOption JsonKinds [] = { + { 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) +{ + tokenInfo *const token = xMalloc (1, tokenInfo); + + token->type = TOKEN_UNDEFINED; + token->scopeKind = TAG_NONE; + token->string = vStringNew (); + token->scope = vStringNew (); + token->lineNumber = getSourceLineNumber (); + token->filePosition = getInputFilePosition (); + + return token; +} + +static void deleteToken (tokenInfo *const token) +{ + vStringDelete (token->string); + vStringDelete (token->scope); + eFree (token); +} + +static void copyToken (tokenInfo *const dest, tokenInfo *const src) +{ + dest->type = src->type; + dest->scopeKind = src->scopeKind; + vStringCopy (dest->string, src->string); + vStringCopy (dest->scope, src->scope); + dest->lineNumber = src->lineNumber; + dest->filePosition = src->filePosition; +} + +static void makeJsonTag (tokenInfo *const token, const jsonKind kind) +{ + tagEntryInfo e; + + if (! JsonKinds[kind].enabled) + return; + + initTagEntry (&e, vStringValue (token->string)); + + e.lineNumber = token->lineNumber; + e.filePosition = token->filePosition; + e.kindName = JsonKinds[kind].name; + e.kind = JsonKinds[kind].letter; + + if (vStringLength (token->scope) > 0) + { + Assert (token->scopeKind > TAG_NONE && token->scopeKind < TAG_COUNT); + + e.extensionFields.scope[0] = JsonKinds[token->scopeKind].name; + e.extensionFields.scope[1] = vStringValue (token->scope); + } + + makeTagEntry (&e); +} + +static boolean isIdentChar (int c) +{ + return (isalnum (c) || c == '+' || c == '-' || c == '.'); +} + +static void readTokenFull (tokenInfo *const token, + boolean includeStringRepr) +{ + int c; + + token->type = TOKEN_UNDEFINED; + vStringClear (token->string); + + do + c = fileGetc (); + while (c == '\t' || c == ' ' || c == '\r' || c == '\n'); + + token->lineNumber = getSourceLineNumber (); + token->filePosition = getInputFilePosition (); + + switch (c) + { + case EOF: token->type = TOKEN_EOF; break; + case '[': token->type = TOKEN_OPEN_SQUARE; break; + case ']': token->type = TOKEN_CLOSE_SQUARE; break; + case '{': token->type = TOKEN_OPEN_CURLY; break; + case '}': token->type = TOKEN_CLOSE_CURLY; break; + case ':': token->type = TOKEN_COLON; break; + case ',': token->type = TOKEN_COMMA; break; + + case '"': + { + boolean escaped = FALSE; + token->type = TOKEN_STRING; + while (TRUE) + { + c = fileGetc (); + /* we don't handle unicode escapes but they are safe */ + if (escaped) + escaped = FALSE; + else if (c == '\\') + escaped = TRUE; + else if (c >= 0x00 && c <= 0x1F) + break; /* break on invalid, unescaped, control characters */ + else if (c == '"' || c == EOF) + break; + if (includeStringRepr) + vStringPut (token->string, c); + } + vStringTerminate (token->string); + break; + } + + default: + if (! isIdentChar (c)) + token->type = TOKEN_UNDEFINED; + else + { + do + { + vStringPut (token->string, c); + c = fileGetc (); + } + while (c != EOF && isIdentChar (c)); + vStringTerminate (token->string); + fileUngetc (c); + switch (lookupKeyword (vStringValue (token->string), Lang_json)) + { + case KEYWORD_true: token->type = TOKEN_TRUE; break; + case KEYWORD_false: token->type = TOKEN_FALSE; break; + case KEYWORD_null: token->type = TOKEN_NULL; break; + default: token->type = TOKEN_NUMBER; break; + } + } + break; + } +} + +#define readToken(t) (readTokenFull ((t), FALSE)) + +static void pushScope (tokenInfo *const token, + const tokenInfo *const parent, + const jsonKind parentKind) +{ + if (vStringLength (token->scope) > 0) + vStringPut (token->scope, '.'); + vStringCat (token->scope, parent->string); + vStringTerminate (token->scope); + token->scopeKind = parentKind; +} + +static void popScope (tokenInfo *const token, + const tokenInfo *const parent) +{ + char *dot = strrchr (token->scope->buffer, '.'); + + if (! dot) + vStringClear (token->scope); + else + { + *dot = 0; + token->scope->length = dot - token->scope->buffer; + } + token->scopeKind = parent->scopeKind; +} + +#define skipToOneOf2(token, type1, type2) \ + (skipToOneOf3 (token, type1, type2, TOKEN_EOF /* dummy */)) + +#define skipTo(token, type) \ + (skipToOneOf3 (token, type, /* dummies */ TOKEN_EOF, TOKEN_EOF)) + +static void skipToOneOf3 (tokenInfo *const token, + const tokenType type1, + const tokenType type2, + const tokenType type3) +{ + while (token->type != TOKEN_EOF && + token->type != type1 && + token->type != type2 && + token->type != type3) + { + readToken (token); + if (token->type == TOKEN_OPEN_CURLY) + { + skipTo (token, TOKEN_CLOSE_CURLY); + readToken (token); + } + else if (token->type == TOKEN_OPEN_SQUARE) + { + skipTo (token, TOKEN_CLOSE_SQUARE); + readToken (token); + } + } +} + +static jsonKind tokenToKind (const tokenType type) +{ + switch (type) + { + case TOKEN_OPEN_CURLY: return TAG_OBJECT; + case TOKEN_OPEN_SQUARE: return TAG_ARRAY; + case TOKEN_STRING: return TAG_STRING; + case TOKEN_TRUE: + case TOKEN_FALSE: return TAG_BOOLEAN; + case TOKEN_NUMBER: return TAG_NUMBER; + default: return TAG_NULL; + } +} + +static void parseValue (tokenInfo *const token) +{ + if (token->type == TOKEN_OPEN_CURLY) + { + tokenInfo *name = newToken (); + + do + { + readTokenFull (token, TRUE); + if (token->type == TOKEN_STRING) + { + jsonKind tagKind = TAG_NULL; /* default in case of invalid value */ + + copyToken (name, token); + + /* skip any possible garbage before the value */ + skipToOneOf3 (token, TOKEN_CLOSE_CURLY, TOKEN_COLON, TOKEN_COMMA); + + if (token->type == TOKEN_COLON) + { + readToken (token); + tagKind = tokenToKind (token->type); + + pushScope (token, name, tagKind); + parseValue (token); + popScope (token, name); + } + + makeJsonTag (name, tagKind); + } + /* skip to the end of the construct */ + skipToOneOf2 (token, TOKEN_CLOSE_CURLY, TOKEN_COMMA); + } + while (token->type != TOKEN_EOF && + token->type != TOKEN_CLOSE_CURLY); + + if (token->type == TOKEN_CLOSE_CURLY) + readToken (token); + + deleteToken (name); + } + else if (token->type == TOKEN_OPEN_SQUARE) + { + tokenInfo *name = newToken (); + char buf[32]; + unsigned int nth = 0; + + readToken (token); + while (token->type != TOKEN_EOF && + token->type != TOKEN_CLOSE_SQUARE) + { + jsonKind tagKind; + + tagKind = tokenToKind (token->type); + + copyToken (name, token); + snprintf (buf, sizeof buf, "%u", nth++); + vStringCopyS (name->string, buf); + + makeJsonTag (name, tagKind); + pushScope (token, name, tagKind); + parseValue (token); + popScope (token, name); + + /* skip to the end of the construct */ + skipToOneOf2 (token, TOKEN_CLOSE_SQUARE, TOKEN_COMMA); + if (token->type != TOKEN_CLOSE_SQUARE) + readToken (token); + } + + if (token->type == TOKEN_CLOSE_SQUARE) + readToken (token); + + deleteToken (name); + } +} + +static void findJsonTags (void) +{ + tokenInfo *const token = newToken (); + + /* We allow multiple top-level elements, although it's not actually valid + * JSON. An interesting side effect of this is that we allow a leading + * Unicode BOM mark -- even though ok, many JSON parsers will choke on it */ + do + { + readToken (token); + parseValue (token); + } + while (token->type != TOKEN_EOF); + + deleteToken (token); +} + +static void initialize (const langType language) +{ + Lang_json = language; + addKeyword ("true", language, KEYWORD_true); + addKeyword ("false", language, KEYWORD_false); + addKeyword ("null", language, KEYWORD_null); +} + +/* Create parser definition stucture */ +extern parserDefinition* JsonParser (void) +{ + static const char *const extensions [] = { "json", NULL }; + parserDefinition *const def = parserNew ("JSON"); + def->extensions = extensions; + def->kinds = JsonKinds; + def->kindCount = KIND_COUNT (JsonKinds); + def->parser = findJsonTags; + def->initialize = initialize; + + return def; +} Modified: tagmanager/ctags/makefile.win32 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -44,7 +44,7 @@ all: $(COMPLIB) clean: -$(RM) deps.mak *.o $(COMPLIB) -$(COMPLIB): abaqus.o abc.o args.o c.o cobol.o fortran.o make.o conf.o pascal.o perl.o php.o diff.o vhdl.o verilog.o lua.o js.o \ +$(COMPLIB): abaqus.o abc.o args.o c.o cobol.o fortran.o make.o conf.o pascal.o perl.o php.o diff.o vhdl.o verilog.o lua.o js.o json.o \ actionscript.o nsis.o objc.o \ haskell.o haxe.o html.o python.o lregex.o asciidoc.o rest.o sh.o ctags.o entry.o get.o keyword.o nestlevel.o \ options.o \ Modified: tagmanager/ctags/parsers.h 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -62,7 +62,8 @@ AsciidocParser, \ AbaqusParser, \ RustParser, \ - GoParser + GoParser, \ + JsonParser #endif /* _PARSERS_H */ Modified: tagmanager/src/tm_parser.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -69,6 +69,7 @@ typedef enum TM_PARSER_ABAQUS, TM_PARSER_RUST, TM_PARSER_GO, + TM_PARSER_JSON, TM_PARSER_COUNT } TMParserType; Modified: tests/ctags/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -247,6 +247,7 @@ test_sources = \ simple.d \ simple.html \ simple.js \ + simple.json \ simple.ksh \ simple.lua \ simple.mak \ Modified: tests/ctags/simple.json 25 lines changed, 25 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,25 @@ +{ + "firstName": "John", + "lastName": "Smith", + "isAlive": true, + "age": 25, + "height_cm": 167.6, + "address": { + "streetAddress": "21 2nd Street", + "city": "New York", + "state": "NY", + "postalCode": "10021-3100" + }, + "phoneNumbers": [ + { + "type": "home", + "number": "212 555-1234" + }, + { + "type": "office", + "number": "646 555-4567" + } + ], + "children": [], + "spouse": null +} Modified: tests/ctags/simple.json.tags 20 lines changed, 20 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,20 @@ +# 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 Modified: wscript 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -87,6 +87,7 @@ ctags_sources = set([ 'tagmanager/ctags/haxe.c', 'tagmanager/ctags/html.c', 'tagmanager/ctags/js.c', + 'tagmanager/ctags/json.c', 'tagmanager/ctags/keyword.c', 'tagmanager/ctags/latex.c', 'tagmanager/ctags/lregex.c', -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 8aa4f1: Optimize notebook page -> document lookup and remove dead code
by Colomban Wendling 21 Feb '15

21 Feb '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 21 Feb 2015 17:56:51 UTC Commit: 8aa4f11cad2cf8404bc58f93464fdcd2140a2f69 https://github.com/geany/geany/commit/8aa4f11cad2cf8404bc58f93464fdcd2140a2… Log Message: ----------- Optimize notebook page -> document lookup and remove dead code This actually fixes a theoretical bug introduced when notebook pages stopped being ScintillaWidgets, but this bug had no effect because it was in a dead code path -- because no, `page_num` never is -1 nor `page` NULL. Modified Paths: -------------- src/callbacks.c src/document.c src/document.h Modified: src/callbacks.c 5 lines changed, 1 insertions(+), 4 deletions(-) =================================================================== @@ -540,10 +540,7 @@ G_MODULE_EXPORT void on_notebook1_switch_page_after(GtkNotebook *notebook, gpoin if (G_UNLIKELY(main_status.opening_session_files || main_status.closing_all)) return; - if (page_num == (guint) -1 && page != NULL) - doc = document_find_by_sci(SCINTILLA(page)); - else - doc = document_get_from_page(page_num); + doc = document_get_from_notebook_child(page); if (doc != NULL) { Modified: src/document.c 21 lines changed, 15 insertions(+), 6 deletions(-) =================================================================== @@ -338,6 +338,20 @@ static ScintillaObject *locate_sci_in_container(GtkWidget *container) } +/* Finds the document for the given notebook page widget */ +GeanyDocument *document_get_from_notebook_child(GtkWidget *page) +{ + ScintillaObject *sci; + + g_return_val_if_fail(GTK_IS_BOX(page), NULL); + + sci = locate_sci_in_container(page); + g_return_val_if_fail(IS_SCINTILLA(sci), NULL); + + return document_find_by_sci(sci); +} + + /** * Finds the document for the given notebook page @a page_num. * @@ -348,18 +362,13 @@ static ScintillaObject *locate_sci_in_container(GtkWidget *container) GeanyDocument *document_get_from_page(guint page_num) { GtkWidget *parent; - ScintillaObject *sci; if (page_num >= documents_array->len) return NULL; parent = gtk_notebook_get_nth_page(GTK_NOTEBOOK(main_widgets.notebook), page_num); - g_return_val_if_fail(GTK_IS_BOX(parent), NULL); - sci = locate_sci_in_container(parent); - g_return_val_if_fail(IS_SCINTILLA(sci), NULL); - - return document_find_by_sci(sci); + return document_get_from_notebook_child(parent); } Modified: src/document.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -172,6 +172,8 @@ GeanyDocument* document_new_file(const gchar *filename, GeanyFiletype *ft, const GeanyDocument *document_get_current(void); +GeanyDocument *document_get_from_notebook_child(GtkWidget *page); + GeanyDocument* document_get_from_page(guint page_num); GeanyDocument* document_find_by_filename(const gchar *utf8_filename); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 1a8de8: Optimize document -> notebook page lookup
by Colomban Wendling 21 Feb '15

21 Feb '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 21 Feb 2015 17:53:59 UTC Commit: 1a8de8fb09959ef22281328f25a6b03ede1fbafe https://github.com/geany/geany/commit/1a8de8fb09959ef22281328f25a6b03ede1fb… Log Message: ----------- Optimize document -> notebook page lookup Modified Paths: -------------- src/document.c Modified: src/document.c 3 lines changed, 1 insertions(+), 2 deletions(-) =================================================================== @@ -3323,8 +3323,7 @@ static GtkWidget* document_show_message(GeanyDocument *doc, GtkMessageType msgty gchar *text, *markup; GtkWidget *hbox, *vbox, *icon, *label, *extra_label, *content_area; GtkWidget *info_widget, *parent; - parent = gtk_notebook_get_nth_page(GTK_NOTEBOOK(main_widgets.notebook), - document_get_notebook_page(doc)); + parent = document_get_notebook_child(doc); va_start(args, format); text = g_strdup_vprintf(format, args); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2015