Commits November 2014

commits@lists.geany.org

1 participants
90 discussions

[geany/geany] 8da955: Make the currently open project insensitive in the recent menu
by Colomban Wendling 29 Nov '14

29 Nov '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 11 Nov 2014 16:46:31 UTC Commit: 8da955ec949b3d60a68402847703c2a16f617f70 https://github.com/geany/geany/commit/8da955ec949b3d60a68402847703c2a16f617… Log Message: ----------- Make the currently open project insensitive in the recent menu Modified Paths: -------------- src/project.c src/ui_utils.c src/ui_utils.h Modified: src/project.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -381,6 +381,7 @@ static void update_ui(void) build_menu_update(NULL); // update project name sidebar_openfiles_update_all(); + ui_update_recent_project_menu(); } Modified: src/ui_utils.c 29 lines changed, 29 insertions(+), 0 deletions(-) =================================================================== @@ -1279,6 +1279,29 @@ static gint find_recent_file_item(gconstpointer list_data, gconstpointer user_da } +/* update the project menu item's sensitivity */ +void ui_update_recent_project_menu(void) +{ + GeanyRecentFiles *grf = recent_get_recent_projects(); + GList *children, *item; + + /* only need to update the menubar menu, the project doesn't have a toolbar item */ + children = gtk_container_get_children(GTK_CONTAINER(grf->menubar)); + for (item = children; item; item = item->next) + { + gboolean sensitive = TRUE; + + if (app->project) + { + const gchar *filename = gtk_menu_item_get_label(item->data); + sensitive = g_strcmp0(app->project->file_name, filename) != 0; + } + gtk_widget_set_sensitive(item->data, sensitive); + } + g_list_free(children); +} + + static void add_recent_file_menu_item(const gchar *utf8_filename, GeanyRecentFiles *grf, GtkWidget *menu) { GtkWidget *child = gtk_menu_item_new_with_label(utf8_filename); @@ -1327,6 +1350,9 @@ static void recent_file_loaded(const gchar *utf8_filename, GeanyRecentFiles *grf add_recent_file_menu_item(utf8_filename, grf, parents[i]); g_list_free(children); } + + if (grf->type == RECENT_FILE_PROJECT) + ui_update_recent_project_menu(); } @@ -1362,6 +1388,9 @@ static void update_recent_menu(GeanyRecentFiles *grf) /* create the new item */ add_recent_file_menu_item(filename, grf, parents[i]); } + + if (grf->type == RECENT_FILE_PROJECT) + ui_update_recent_project_menu(); } Modified: src/ui_utils.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -321,6 +321,8 @@ void ui_add_recent_document(GeanyDocument *doc); void ui_add_recent_project_file(const gchar *utf8_filename); +void ui_update_recent_project_menu(void); + void ui_update_tab_status(GeanyDocument *doc); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 3fa41c: Cleanup code for updating recent file menus
by Colomban Wendling 29 Nov '14

29 Nov '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 11 Nov 2014 16:14:21 UTC Commit: 3fa41cc0dadb3470a64f4511d394670d10712e5f https://github.com/geany/geany/commit/3fa41cc0dadb3470a64f4511d394670d10712… Log Message: ----------- Cleanup code for updating recent file menus Modified Paths: -------------- src/ui_utils.c Modified: src/ui_utils.c 112 lines changed, 47 insertions(+), 65 deletions(-) =================================================================== @@ -1279,91 +1279,77 @@ static gint find_recent_file_item(gconstpointer list_data, gconstpointer user_da } +static void add_recent_file_menu_item(const gchar *utf8_filename, GeanyRecentFiles *grf, GtkWidget *menu) +{ + GtkWidget *child = gtk_menu_item_new_with_label(utf8_filename); + + gtk_widget_show(child); + if (menu != grf->toolbar) + gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), child); + else + { + /* this is a bit ugly, but we need to use gtk_container_add(). Using + * gtk_menu_shell_prepend() doesn't emit GtkContainer's "add" signal + * which we need in GeanyMenubuttonAction */ + gtk_container_add(GTK_CONTAINER(menu), child); + gtk_menu_reorder_child(GTK_MENU(menu), child, 0); + } + g_signal_connect(child, "activate", G_CALLBACK(grf->activate_cb), NULL); +} + + static void recent_file_loaded(const gchar *utf8_filename, GeanyRecentFiles *grf) { - GList *item, *children; - void *data; - GtkWidget *tmp; + GList *item; + GtkWidget *parents[] = { grf->menubar, grf->toolbar }; + guint i; /* first reorder the queue */ item = g_queue_find_custom(grf->recent_queue, utf8_filename, (GCompareFunc) strcmp); g_return_if_fail(item != NULL); - data = item->data; - g_queue_remove(grf->recent_queue, data); - g_queue_push_head(grf->recent_queue, data); - - /* remove the old menuitem for the filename */ - children = gtk_container_get_children(GTK_CONTAINER(grf->menubar)); - item = g_list_find_custom(children, utf8_filename, (GCompareFunc) find_recent_file_item); - if (item != NULL) - gtk_widget_destroy(GTK_WIDGET(item->data)); - g_list_free(children); + g_queue_unlink(grf->recent_queue, item); + g_queue_push_head_link(grf->recent_queue, item); - if (grf->toolbar != NULL) + for (i = 0; i < G_N_ELEMENTS(parents); i++) { - children = gtk_container_get_children(GTK_CONTAINER(grf->toolbar)); + GList *children; + + if (! parents[i]) + continue; + + children = gtk_container_get_children(GTK_CONTAINER(parents[i])); item = g_list_find_custom(children, utf8_filename, (GCompareFunc) find_recent_file_item); - if (item != NULL) - gtk_widget_destroy(GTK_WIDGET(item->data)); + /* either reorder or prepend a new one */ + if (item) + gtk_menu_reorder_child(GTK_MENU(parents[i]), item->data, 0); + else + add_recent_file_menu_item(utf8_filename, grf, parents[i]); g_list_free(children); } - /* now prepend a new menuitem for the filename, - * first for the recent files menu in the menu bar */ - tmp = gtk_menu_item_new_with_label(utf8_filename); - gtk_widget_show(tmp); - gtk_menu_shell_prepend(GTK_MENU_SHELL(grf->menubar), tmp); - g_signal_connect(tmp, "activate", G_CALLBACK(grf->activate_cb), NULL); - /* then for the recent files menu in the tool bar */ - if (grf->toolbar != NULL) - { - tmp = gtk_menu_item_new_with_label(utf8_filename); - gtk_widget_show(tmp); - gtk_container_add(GTK_CONTAINER(grf->toolbar), tmp); - /* this is a bit ugly, but we need to use gtk_container_add(). Using - * gtk_menu_shell_prepend() doesn't emit GtkContainer's "add" signal which we need in - * GeanyMenubuttonAction */ - gtk_menu_reorder_child(GTK_MENU(grf->toolbar), tmp, 0); - g_signal_connect(tmp, "activate", G_CALLBACK(grf->activate_cb), NULL); - } } static void update_recent_menu(GeanyRecentFiles *grf) { - GtkWidget *tmp; gchar *filename; - GList *children, *item; + GtkWidget *parents[] = { grf->menubar, grf->toolbar }; + guint i; filename = g_queue_peek_head(grf->recent_queue); - /* clean the MRU list before adding an item (menubar) */ - children = gtk_container_get_children(GTK_CONTAINER(grf->menubar)); - if (g_list_length(children) > file_prefs.mru_length - 1) + for (i = 0; i < G_N_ELEMENTS(parents); i++) { - item = g_list_nth(children, file_prefs.mru_length - 1); - while (item != NULL) - { - if (GTK_IS_MENU_ITEM(item->data)) - gtk_widget_destroy(GTK_WIDGET(item->data)); - item = g_list_next(item); - } - } - g_list_free(children); + GList *children; - /* create item for the menu bar menu */ - tmp = gtk_menu_item_new_with_label(filename); - gtk_widget_show(tmp); - gtk_menu_shell_prepend(GTK_MENU_SHELL(grf->menubar), tmp); - g_signal_connect(tmp, "activate", G_CALLBACK(grf->activate_cb), NULL); + if (! parents[i]) + continue; - /* clean the MRU list before adding an item (toolbar) */ - if (grf->toolbar != NULL) - { - children = gtk_container_get_children(GTK_CONTAINER(grf->toolbar)); + /* clean the MRU list before adding an item */ + children = gtk_container_get_children(GTK_CONTAINER(parents[i])); if (g_list_length(children) > file_prefs.mru_length - 1) { - item = g_list_nth(children, file_prefs.mru_length - 1); + GList *item = g_list_nth(children, file_prefs.mru_length - 1); while (item != NULL) { if (GTK_IS_MENU_ITEM(item->data)) @@ -1373,12 +1359,8 @@ static void update_recent_menu(GeanyRecentFiles *grf) } g_list_free(children); - /* create item for the tool bar menu */ - tmp = gtk_menu_item_new_with_label(filename); - gtk_widget_show(tmp); - gtk_container_add(GTK_CONTAINER(grf->toolbar), tmp); - gtk_menu_reorder_child(GTK_MENU(grf->toolbar), tmp, 0); - g_signal_connect(tmp, "activate", G_CALLBACK(grf->activate_cb), NULL); + /* create the new item */ + add_recent_file_menu_item(filename, grf, parents[i]); } } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 6e1c27: Merge branch 'recent-list-cleanup'
by Colomban Wendling 29 Nov '14

29 Nov '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 29 Nov 2014 21:49:57 UTC Commit: 6e1c2787c1ecf7d6a178d5c3cbaaa93240ca79cf https://github.com/geany/geany/commit/6e1c2787c1ecf7d6a178d5c3cbaaa93240ca7… Log Message: ----------- Merge branch 'recent-list-cleanup' Modified Paths: -------------- src/project.c src/ui_utils.c src/ui_utils.h Modified: src/project.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -381,6 +381,7 @@ static void update_ui(void) build_menu_update(NULL); // update project name sidebar_openfiles_update_all(); + ui_update_recent_project_menu(); } Modified: src/ui_utils.c 141 lines changed, 76 insertions(+), 65 deletions(-) =================================================================== @@ -1279,91 +1279,103 @@ static gint find_recent_file_item(gconstpointer list_data, gconstpointer user_da } +/* update the project menu item's sensitivity */ +void ui_update_recent_project_menu(void) +{ + GeanyRecentFiles *grf = recent_get_recent_projects(); + GList *children, *item; + + /* only need to update the menubar menu, the project doesn't have a toolbar item */ + children = gtk_container_get_children(GTK_CONTAINER(grf->menubar)); + for (item = children; item; item = item->next) + { + gboolean sensitive = TRUE; + + if (app->project) + { + const gchar *filename = gtk_menu_item_get_label(item->data); + sensitive = g_strcmp0(app->project->file_name, filename) != 0; + } + gtk_widget_set_sensitive(item->data, sensitive); + } + g_list_free(children); +} + + +static void add_recent_file_menu_item(const gchar *utf8_filename, GeanyRecentFiles *grf, GtkWidget *menu) +{ + GtkWidget *child = gtk_menu_item_new_with_label(utf8_filename); + + gtk_widget_show(child); + if (menu != grf->toolbar) + gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), child); + else + { + /* this is a bit ugly, but we need to use gtk_container_add(). Using + * gtk_menu_shell_prepend() doesn't emit GtkContainer's "add" signal + * which we need in GeanyMenubuttonAction */ + gtk_container_add(GTK_CONTAINER(menu), child); + gtk_menu_reorder_child(GTK_MENU(menu), child, 0); + } + g_signal_connect(child, "activate", G_CALLBACK(grf->activate_cb), NULL); +} + + static void recent_file_loaded(const gchar *utf8_filename, GeanyRecentFiles *grf) { - GList *item, *children; - void *data; - GtkWidget *tmp; + GList *item; + GtkWidget *parents[] = { grf->menubar, grf->toolbar }; + guint i; /* first reorder the queue */ item = g_queue_find_custom(grf->recent_queue, utf8_filename, (GCompareFunc) strcmp); g_return_if_fail(item != NULL); - data = item->data; - g_queue_remove(grf->recent_queue, data); - g_queue_push_head(grf->recent_queue, data); + g_queue_unlink(grf->recent_queue, item); + g_queue_push_head_link(grf->recent_queue, item); - /* remove the old menuitem for the filename */ - children = gtk_container_get_children(GTK_CONTAINER(grf->menubar)); - item = g_list_find_custom(children, utf8_filename, (GCompareFunc) find_recent_file_item); - if (item != NULL) - gtk_widget_destroy(GTK_WIDGET(item->data)); - g_list_free(children); - - if (grf->toolbar != NULL) + for (i = 0; i < G_N_ELEMENTS(parents); i++) { - children = gtk_container_get_children(GTK_CONTAINER(grf->toolbar)); + GList *children; + + if (! parents[i]) + continue; + + children = gtk_container_get_children(GTK_CONTAINER(parents[i])); item = g_list_find_custom(children, utf8_filename, (GCompareFunc) find_recent_file_item); - if (item != NULL) - gtk_widget_destroy(GTK_WIDGET(item->data)); + /* either reorder or prepend a new one */ + if (item) + gtk_menu_reorder_child(GTK_MENU(parents[i]), item->data, 0); + else + add_recent_file_menu_item(utf8_filename, grf, parents[i]); g_list_free(children); } - /* now prepend a new menuitem for the filename, - * first for the recent files menu in the menu bar */ - tmp = gtk_menu_item_new_with_label(utf8_filename); - gtk_widget_show(tmp); - gtk_menu_shell_prepend(GTK_MENU_SHELL(grf->menubar), tmp); - g_signal_connect(tmp, "activate", G_CALLBACK(grf->activate_cb), NULL); - /* then for the recent files menu in the tool bar */ - if (grf->toolbar != NULL) - { - tmp = gtk_menu_item_new_with_label(utf8_filename); - gtk_widget_show(tmp); - gtk_container_add(GTK_CONTAINER(grf->toolbar), tmp); - /* this is a bit ugly, but we need to use gtk_container_add(). Using - * gtk_menu_shell_prepend() doesn't emit GtkContainer's "add" signal which we need in - * GeanyMenubuttonAction */ - gtk_menu_reorder_child(GTK_MENU(grf->toolbar), tmp, 0); - g_signal_connect(tmp, "activate", G_CALLBACK(grf->activate_cb), NULL); - } + + if (grf->type == RECENT_FILE_PROJECT) + ui_update_recent_project_menu(); } static void update_recent_menu(GeanyRecentFiles *grf) { - GtkWidget *tmp; gchar *filename; - GList *children, *item; + GtkWidget *parents[] = { grf->menubar, grf->toolbar }; + guint i; filename = g_queue_peek_head(grf->recent_queue); - /* clean the MRU list before adding an item (menubar) */ - children = gtk_container_get_children(GTK_CONTAINER(grf->menubar)); - if (g_list_length(children) > file_prefs.mru_length - 1) + for (i = 0; i < G_N_ELEMENTS(parents); i++) { - item = g_list_nth(children, file_prefs.mru_length - 1); - while (item != NULL) - { - if (GTK_IS_MENU_ITEM(item->data)) - gtk_widget_destroy(GTK_WIDGET(item->data)); - item = g_list_next(item); - } - } - g_list_free(children); + GList *children; - /* create item for the menu bar menu */ - tmp = gtk_menu_item_new_with_label(filename); - gtk_widget_show(tmp); - gtk_menu_shell_prepend(GTK_MENU_SHELL(grf->menubar), tmp); - g_signal_connect(tmp, "activate", G_CALLBACK(grf->activate_cb), NULL); + if (! parents[i]) + continue; - /* clean the MRU list before adding an item (toolbar) */ - if (grf->toolbar != NULL) - { - children = gtk_container_get_children(GTK_CONTAINER(grf->toolbar)); + /* clean the MRU list before adding an item */ + children = gtk_container_get_children(GTK_CONTAINER(parents[i])); if (g_list_length(children) > file_prefs.mru_length - 1) { - item = g_list_nth(children, file_prefs.mru_length - 1); + GList *item = g_list_nth(children, file_prefs.mru_length - 1); while (item != NULL) { if (GTK_IS_MENU_ITEM(item->data)) @@ -1373,13 +1385,12 @@ static void update_recent_menu(GeanyRecentFiles *grf) } g_list_free(children); - /* create item for the tool bar menu */ - tmp = gtk_menu_item_new_with_label(filename); - gtk_widget_show(tmp); - gtk_container_add(GTK_CONTAINER(grf->toolbar), tmp); - gtk_menu_reorder_child(GTK_MENU(grf->toolbar), tmp, 0); - g_signal_connect(tmp, "activate", G_CALLBACK(grf->activate_cb), NULL); + /* create the new item */ + add_recent_file_menu_item(filename, grf, parents[i]); } + + if (grf->type == RECENT_FILE_PROJECT) + ui_update_recent_project_menu(); } Modified: src/ui_utils.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -321,6 +321,8 @@ void ui_add_recent_document(GeanyDocument *doc); void ui_add_recent_project_file(const gchar *utf8_filename); +void ui_update_recent_project_menu(void); + void ui_update_tab_status(GeanyDocument *doc); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 173c09: Merge pull request #302 from kernc/common_linters
by Colomban Wendling 29 Nov '14

29 Nov '14

Branch: refs/heads/master Author: Colomban Wendling <lists.ban(a)herbesfolles.org> Committer: Colomban Wendling <lists.ban(a)herbesfolles.org> Date: Sat, 29 Nov 2014 21:48:01 UTC Commit: 173c09eab2afcd9549b75cd779bedca54fc9f718 https://github.com/geany/geany/commit/173c09eab2afcd9549b75cd779bedca54fc9f… Log Message: ----------- Merge pull request #302 from kernc/common_linters Common linters by default in the Build menu Modified Paths: -------------- data/filetypes.c data/filetypes.cpp data/filetypes.haskell data/filetypes.javascript data/filetypes.python data/filetypes.ruby data/filetypes.sh data/filetypes.xml doc/geany.txt Modified: data/filetypes.c 19 lines changed, 13 insertions(+), 6 deletions(-) =================================================================== @@ -78,12 +78,19 @@ context_action_cmd= # 0 is spaces, 1 is tabs, 2 is tab & spaces #type=1 -[build_settings] +[build-menu] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension # (use only one of it at one time) -compiler=gcc -Wall -c "%f" -linker=gcc -Wall -o "%e" "%f" -run_cmd="./%e" - - +FT_00_LB=_Compile +FT_00_CM=gcc -Wall -c "%f" +FT_00_WD= +FT_01_LB=_Build +FT_01_CM=gcc -Wall -o "%e" "%f" +FT_01_WD= +FT_02_LB=_Lint +FT_02_CM=cppcheck --language=c --enable=warning,style --template=gcc "%f" +FT_02_WD= +EX_00_LB=_Execute +EX_00_CM="./%e" +EX_00_WD= Modified: data/filetypes.cpp 18 lines changed, 13 insertions(+), 5 deletions(-) =================================================================== @@ -50,11 +50,19 @@ context_action_cmd= # 0 is spaces, 1 is tabs, 2 is tab & spaces #type=1 -[build_settings] +[build-menu] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension # (use only one of it at one time) -compiler=g++ -Wall -c "%f" -linker=g++ -Wall -o "%e" "%f" -run_cmd="./%e" - +FT_00_LB=_Compile +FT_00_CM=g++ -Wall -c "%f" +FT_00_WD= +FT_01_LB=_Build +FT_01_CM=g++ -Wall -o "%e" "%f" +FT_01_WD= +FT_02_LB=_Lint +FT_02_CM=cppcheck --language=c++ --enable=warning,style --template=gcc "%f" +FT_02_WD= +EX_00_LB=_Execute +EX_00_CM="./%e" +EX_00_WD= Modified: data/filetypes.haskell 13 lines changed, 10 insertions(+), 3 deletions(-) =================================================================== @@ -72,9 +72,16 @@ context_action_cmd= # 0 is spaces, 1 is tabs, 2 is tab & spaces #type=1 -[build_settings] +[build-menu] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension # (use only one of it at one time) -compiler=ghc --make "%f" -run_cmd="./%e" +FT_00_LB=_Compile +FT_00_CM=ghc --make "%f" +FT_00_WD= +FT_02_LB=_Lint +FT_02_CM=hlint "%f" +FT_02_WD= +EX_00_LB=_Execute +EX_00_CM="./%e" +EX_00_WD= Modified: data/filetypes.javascript 10 lines changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -38,11 +38,11 @@ context_action_cmd= # 0 is spaces, 1 is tabs, 2 is tab & spaces #type=1 -[build_settings] +[build-menu] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension # (use only one of it at one time) -compiler= -run= - - +FT_02_LB=_Lint +FT_02_CM=jshint "%f" +FT_02_WD= +error_regex=([^:]+): line ([0-9]+), col ([0-9]+) Modified: data/filetypes.python 14 lines changed, 11 insertions(+), 3 deletions(-) =================================================================== @@ -61,9 +61,17 @@ context_action_cmd= # 0 is spaces, 1 is tabs, 2 is tab & spaces #type=0 -[build_settings] +[build-menu] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension # (use only one of it at one time) -compiler=python -m py_compile "%f" -run_cmd=python "%f" +FT_00_LB=_Compile +FT_00_CM=python -m py_compile "%f" +FT_00_WD= +FT_02_LB=_Lint +FT_02_CM=pep8 --max-line-length=80 "%f" +FT_02_WD= +error_regex=(.+):([0-9]+):([0-9]+) +EX_00_LB=_Execute +EX_00_CM=python "%f" +EX_00_WD= Modified: data/filetypes.ruby 10 lines changed, 7 insertions(+), 3 deletions(-) =================================================================== @@ -73,9 +73,13 @@ context_action_cmd= # 0 is spaces, 1 is tabs, 2 is tab & spaces #type=1 -[build_settings] +[build-menu] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension # (use only one of it at one time) -compiler=ruby -c "%f" -run_cmd=ruby "%f" +FT_00_LB=_Compile +FT_00_CM=ruby -wc "%f" +FT_00_WD= +EX_00_LB=_Execute +EX_00_CM=ruby "%f" +EX_00_WD= Modified: data/filetypes.sh 9 lines changed, 7 insertions(+), 2 deletions(-) =================================================================== @@ -52,8 +52,13 @@ context_action_cmd= # 0 is spaces, 1 is tabs, 2 is tab & spaces #type=1 -[build_settings] +[build-menu] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension # (use only one of it at one time) -run_cmd="./%f" +FT_02_LB=_Lint +FT_02_CM=shellcheck --format=gcc "%f" +FT_02_WD= +EX_00_LB=_Execute +EX_00_CM="./%f" +EX_00_WD= Modified: data/filetypes.xml 9 lines changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -38,3 +38,12 @@ xml_indent_tags=true #width=4 # 0 is spaces, 1 is tabs, 2 is tab & spaces #type=1 + +[build-menu] +# %f will be replaced by the complete filename +# %e will be replaced by the filename without extension +# (use only one of it at one time) +FT_02_LB=_Lint +FT_02_CM=xmllint --noout "%f" +FT_02_WD= +error_regex=(.+):([0-9]+): Modified: doc/geany.txt 15 lines changed, 15 insertions(+), 0 deletions(-) =================================================================== @@ -2886,6 +2886,7 @@ the following items: * Compile * Build +* Lint * Make All * Make Custom Target * Make Object @@ -2925,6 +2926,20 @@ Interpreted languages do not use the Build command. commands is recommended; this will also make it easier for users to build your software. +Lint +```` + +Source code linters are often used to find code that doesn't correspond to +certain style guidelines: non-portable code, common or hard to find +errors, code "smells", variables used before being set, unused functions, +division by zero, constant conditions, etc. Linters inspect the code and +issue warnings much like the compilers do. This is formally referred to as +static code analysis. + +Some common linters are pre-configured for you in the Build menu (``pep8`` +for Python, ``cppcheck`` for C/C++, JSHint for JavaScript, ``xmllint`` for +XML, ``hlint`` for Haskell, ``shellcheck`` for shell code, ...), but all +these are standalone tools you need to obtain before using. Make ```` -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 961ccf: Migrated some old-style build_settings to new-style build-menu
by Kernc 28 Nov '14

28 Nov '14

Branch: refs/heads/master Author: Kernc <kerncece(a)gmail.com> Committer: Kernc <kerncece(a)gmail.com> Date: Fri, 28 Nov 2014 08:09:41 UTC Commit: 961ccf38c5a50fbdfa9eea0ca481ac8a3a04f694 https://github.com/geany/geany/commit/961ccf38c5a50fbdfa9eea0ca481ac8a3a04f… Log Message: ----------- Migrated some old-style build_settings to new-style build-menu Modified Paths: -------------- data/filetypes.c data/filetypes.cpp data/filetypes.haskell data/filetypes.python data/filetypes.ruby data/filetypes.sh Modified: data/filetypes.c 17 lines changed, 9 insertions(+), 8 deletions(-) =================================================================== @@ -78,18 +78,19 @@ context_action_cmd= # 0 is spaces, 1 is tabs, 2 is tab & spaces #type=1 -[build_settings] -# %f will be replaced by the complete filename -# %e will be replaced by the filename without extension -# (use only one of it at one time) -compiler=gcc -Wall -c "%f" -linker=gcc -Wall -o "%e" "%f" -run_cmd="./%e" - [build-menu] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension # (use only one of it at one time) +FT_00_LB=_Compile +FT_00_CM=gcc -Wall -c "%f" +FT_00_WD= +FT_01_LB=_Build +FT_01_CM=gcc -Wall -o "%e" "%f" +FT_01_WD= FT_02_LB=_Lint FT_02_CM=cppcheck --language=c --enable=warning,style --template=gcc "%f" FT_02_WD= +EX_00_LB=_Execute +EX_00_CM="./%e" +EX_00_WD= Modified: data/filetypes.cpp 17 lines changed, 9 insertions(+), 8 deletions(-) =================================================================== @@ -50,18 +50,19 @@ context_action_cmd= # 0 is spaces, 1 is tabs, 2 is tab & spaces #type=1 -[build_settings] -# %f will be replaced by the complete filename -# %e will be replaced by the filename without extension -# (use only one of it at one time) -compiler=g++ -Wall -c "%f" -linker=g++ -Wall -o "%e" "%f" -run_cmd="./%e" - [build-menu] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension # (use only one of it at one time) +FT_00_LB=_Compile +FT_00_CM=g++ -Wall -c "%f" +FT_00_WD= +FT_01_LB=_Build +FT_01_CM=g++ -Wall -o "%e" "%f" +FT_01_WD= FT_02_LB=_Lint FT_02_CM=cppcheck --language=c++ --enable=warning,style --template=gcc "%f" FT_02_WD= +EX_00_LB=_Execute +EX_00_CM="./%e" +EX_00_WD= Modified: data/filetypes.haskell 13 lines changed, 6 insertions(+), 7 deletions(-) =================================================================== @@ -72,17 +72,16 @@ context_action_cmd= # 0 is spaces, 1 is tabs, 2 is tab & spaces #type=1 -[build_settings] -# %f will be replaced by the complete filename -# %e will be replaced by the filename without extension -# (use only one of it at one time) -compiler=ghc --make "%f" -run_cmd="./%e" - [build-menu] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension # (use only one of it at one time) +FT_00_LB=_Compile +FT_00_CM=ghc --make "%f" +FT_00_WD= FT_02_LB=_Lint FT_02_CM=hlint "%f" FT_02_WD= +EX_00_LB=_Execute +EX_00_CM="./%e" +EX_00_WD= Modified: data/filetypes.python 13 lines changed, 6 insertions(+), 7 deletions(-) =================================================================== @@ -61,18 +61,17 @@ context_action_cmd= # 0 is spaces, 1 is tabs, 2 is tab & spaces #type=0 -[build_settings] -# %f will be replaced by the complete filename -# %e will be replaced by the filename without extension -# (use only one of it at one time) -compiler=python -m py_compile "%f" -run_cmd=python "%f" - [build-menu] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension # (use only one of it at one time) +FT_00_LB=_Compile +FT_00_CM=python -m py_compile "%f" +FT_00_WD= FT_02_LB=_Lint FT_02_CM=pep8 --max-line-length=80 "%f" FT_02_WD= error_regex=(.+):([0-9]+):([0-9]+) +EX_00_LB=_Execute +EX_00_CM=python "%f" +EX_00_WD= Modified: data/filetypes.ruby 10 lines changed, 7 insertions(+), 3 deletions(-) =================================================================== @@ -73,9 +73,13 @@ context_action_cmd= # 0 is spaces, 1 is tabs, 2 is tab & spaces #type=1 -[build_settings] +[build-menu] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension # (use only one of it at one time) -compiler=ruby -c "%f" -run_cmd=ruby "%f" +FT_00_LB=_Compile +FT_00_CM=ruby -wc "%f" +FT_00_WD= +EX_00_LB=_Execute +EX_00_CM=ruby "%f" +EX_00_WD= Modified: data/filetypes.sh 9 lines changed, 3 insertions(+), 6 deletions(-) =================================================================== @@ -52,12 +52,6 @@ context_action_cmd= # 0 is spaces, 1 is tabs, 2 is tab & spaces #type=1 -[build_settings] -# %f will be replaced by the complete filename -# %e will be replaced by the filename without extension -# (use only one of it at one time) -run_cmd="./%f" - [build-menu] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension @@ -65,3 +59,6 @@ run_cmd="./%f" FT_02_LB=_Lint FT_02_CM=shellcheck --format=gcc "%f" FT_02_WD= +EX_00_LB=_Execute +EX_00_CM="./%f" +EX_00_WD= -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 7a0285: Added some default common linters in the Build menu
by Kernc 28 Nov '14

28 Nov '14

Branch: refs/heads/master Author: Kernc <kerncece(a)gmail.com> Committer: Kernc <kerncece(a)gmail.com> Date: Fri, 28 Nov 2014 08:08:38 UTC Commit: 7a0285eef857bf99361eedae3cfe125254b99f4c https://github.com/geany/geany/commit/7a0285eef857bf99361eedae3cfe125254b99… Log Message: ----------- Added some default common linters in the Build menu Modified Paths: -------------- data/filetypes.c data/filetypes.cpp data/filetypes.haskell data/filetypes.javascript data/filetypes.python data/filetypes.sh data/filetypes.xml doc/geany.txt Modified: data/filetypes.c 8 lines changed, 7 insertions(+), 1 deletions(-) =================================================================== @@ -86,4 +86,10 @@ compiler=gcc -Wall -c "%f" linker=gcc -Wall -o "%e" "%f" run_cmd="./%e" - +[build-menu] +# %f will be replaced by the complete filename +# %e will be replaced by the filename without extension +# (use only one of it at one time) +FT_02_LB=_Lint +FT_02_CM=cppcheck --language=c --enable=warning,style --template=gcc "%f" +FT_02_WD= Modified: data/filetypes.cpp 7 lines changed, 7 insertions(+), 0 deletions(-) =================================================================== @@ -58,3 +58,10 @@ compiler=g++ -Wall -c "%f" linker=g++ -Wall -o "%e" "%f" run_cmd="./%e" +[build-menu] +# %f will be replaced by the complete filename +# %e will be replaced by the filename without extension +# (use only one of it at one time) +FT_02_LB=_Lint +FT_02_CM=cppcheck --language=c++ --enable=warning,style --template=gcc "%f" +FT_02_WD= Modified: data/filetypes.haskell 8 lines changed, 8 insertions(+), 0 deletions(-) =================================================================== @@ -78,3 +78,11 @@ context_action_cmd= # (use only one of it at one time) compiler=ghc --make "%f" run_cmd="./%e" + +[build-menu] +# %f will be replaced by the complete filename +# %e will be replaced by the filename without extension +# (use only one of it at one time) +FT_02_LB=_Lint +FT_02_CM=hlint "%f" +FT_02_WD= Modified: data/filetypes.javascript 10 lines changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -38,11 +38,11 @@ context_action_cmd= # 0 is spaces, 1 is tabs, 2 is tab & spaces #type=1 -[build_settings] +[build-menu] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension # (use only one of it at one time) -compiler= -run= - - +FT_02_LB=_Lint +FT_02_CM=jshint "%f" +FT_02_WD= +error_regex=([^:]+): line ([0-9]+), col ([0-9]+) Modified: data/filetypes.python 9 lines changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -67,3 +67,12 @@ context_action_cmd= # (use only one of it at one time) compiler=python -m py_compile "%f" run_cmd=python "%f" + +[build-menu] +# %f will be replaced by the complete filename +# %e will be replaced by the filename without extension +# (use only one of it at one time) +FT_02_LB=_Lint +FT_02_CM=pep8 --max-line-length=80 "%f" +FT_02_WD= +error_regex=(.+):([0-9]+):([0-9]+) Modified: data/filetypes.sh 8 lines changed, 8 insertions(+), 0 deletions(-) =================================================================== @@ -57,3 +57,11 @@ context_action_cmd= # %e will be replaced by the filename without extension # (use only one of it at one time) run_cmd="./%f" + +[build-menu] +# %f will be replaced by the complete filename +# %e will be replaced by the filename without extension +# (use only one of it at one time) +FT_02_LB=_Lint +FT_02_CM=shellcheck --format=gcc "%f" +FT_02_WD= Modified: data/filetypes.xml 9 lines changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -38,3 +38,12 @@ xml_indent_tags=true #width=4 # 0 is spaces, 1 is tabs, 2 is tab & spaces #type=1 + +[build-menu] +# %f will be replaced by the complete filename +# %e will be replaced by the filename without extension +# (use only one of it at one time) +FT_02_LB=_Lint +FT_02_CM=xmllint --noout "%f" +FT_02_WD= +error_regex=(.+):([0-9]+): Modified: doc/geany.txt 15 lines changed, 15 insertions(+), 0 deletions(-) =================================================================== @@ -2886,6 +2886,7 @@ the following items: * Compile * Build +* Lint * Make All * Make Custom Target * Make Object @@ -2925,6 +2926,20 @@ Interpreted languages do not use the Build command. commands is recommended; this will also make it easier for users to build your software. +Lint +```` + +Source code linters are often used to find code that doesn't correspond to +certain style guidelines: non-portable code, common or hard to find +errors, code "smells", variables used before being set, unused functions, +division by zero, constant conditions, etc. Linters inspect the code and +issue warnings much like the compilers do. This is formally referred to as +static code analysis. + +Some common linters are pre-configured for you in the Build menu (``pep8`` +for Python, ``cppcheck`` for C/C++, JSHint for JavaScript, ``xmllint`` for +XML, ``hlint`` for Haskell, ``shellcheck`` for shell code, ...), but all +these are standalone tools you need to obtain before using. Make ```` -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] e6b74d: Merge branch nullEuro/coffeescript-ft
by Colomban Wendling 26 Nov '14

26 Nov '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 26 Nov 2014 19:06:15 UTC Commit: e6b74d9d85149b687c4acd99ffd45f38554d178f https://github.com/geany/geany/commit/e6b74d9d85149b687c4acd99ffd45f38554d1… Log Message: ----------- Merge branch nullEuro/coffeescript-ft Add CoffeScript syntax highlighting. Closes #230. Modified Paths: -------------- data/Makefile.am data/filetype_extensions.conf data/filetypes.coffeescript scintilla/Makefile.am scintilla/lexers/LexCoffeeScript.cxx scintilla/makefile.win32 scintilla/scintilla_changes.patch scintilla/src/Catalogue.cxx src/filetypes.c src/filetypes.h src/highlighting.c src/highlightingmappings.h Modified: data/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -15,6 +15,7 @@ filetypes = \ filetypes.Clojure.conf \ filetypes.cmake \ filetypes.cobol \ + filetypes.coffeescript \ filetypes.common \ filetypes.conf \ filetypes.cpp \ Modified: data/filetype_extensions.conf 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -16,6 +16,7 @@ CUDA=*.cu;*.cuh;*.h; C#=*.cs; CMake=CMakeLists.txt;*.cmake;*.ctest; COBOL=*.cob;*.cpy;*.cbl;*.cobol; +CoffeeScript=*.coffee;Cakefile;*.Cakefile;*.coffee.erb;*.iced;*.iced.erb Conf=*.conf;*.ini;config;*rc;*.cfg;*.desktop;*.properties; CSS=*.css; Cython=*.pyx;*.pxd;*.pxi; Modified: data/filetypes.coffeescript 48 lines changed, 48 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,48 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +character=character +commentblock=comment +commentline=comment_line +default=default +globalclass=class +identifier=identifier_1 +number=number_1 +operator=operator +regex=regex +string=string_1 +stringeol=string_eol +verbose_regex=regex +verbose_regex_comment=comment +word2=keyword_2 +word=keyword_1 + + +[settings] +extension=coffee +comment_single=# +comment_open=### +comment_close=### +comment_use_indent=true +context_action_cmd= + + +[keywords] +# all items must be in one line +primary=and break by case catch class const continue default delete do each else extends false finally for get if in Infinity instanceof is isnt let loop NaN new no not null of off on or return set switch then this throw true try typeof undefined unless until void when where while with yes yield +secondary=constructor decodeURI decodeURIComponent encodeURI encodeURIComponent eval isFinite isNaN parseFloat parseInt prototype require super +# types, classes +globalclass=Array Boolean Date Error EvalError Function Math Number Object RangeError ReferenceError RegExp String SyntaxError TypeError URIError + +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + +[build-menu] +FT_00_LB=Compile into _Javascript +FT_00_CM=coffee --compile "%f" +FT_01_LB=View compiled _Javascript +FT_01_CM=coffee -p "%f" +EX_00_LB=Run +EX_00_CM=coffee "%f" + Modified: scintilla/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -16,6 +16,7 @@ lexers/LexCPP.cxx \ lexers/LexCSS.cxx \ lexers/LexCaml.cxx \ lexers/LexCmake.cxx \ +lexers/LexCoffeeScript.cxx \ lexers/LexD.cxx \ lexers/LexErlang.cxx \ lexers/LexForth.cxx \ Modified: scintilla/lexers/LexCoffeeScript.cxx 415 lines changed, 415 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,415 @@ +// Scintilla source code edit control +/** @file LexCoffeeScript.cxx + ** Lexer for CoffeeScript. + **/ +// Copyright 1998-2011 by Neil Hodgson <neilh(a)scintilla.org> +// Based on the Scintilla C++ Lexer +// Written by Eric Promislow <ericp(a)activestate.com> in 2011 for the Komodo IDE +// The License.txt file describes the conditions under which this software may be distributed. + +#include <stdlib.h> +#include <string.h> +#include <stdio.h> +#include <stdarg.h> +#include <assert.h> +#include <ctype.h> + +#include "Platform.h" +#include "ILexer.h" +#include "Scintilla.h" +#include "SciLexer.h" + +#include "WordList.h" +#include "LexAccessor.h" +#include "Accessor.h" +#include "StyleContext.h" +#include "CharacterSet.h" +#include "LexerModule.h" + +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif + +static bool IsSpaceEquiv(int state) { + return (state == SCE_COFFEESCRIPT_DEFAULT + || state == SCE_COFFEESCRIPT_COMMENTLINE + || state == SCE_COFFEESCRIPT_COMMENTBLOCK + || state == SCE_COFFEESCRIPT_VERBOSE_REGEX + || state == SCE_COFFEESCRIPT_VERBOSE_REGEX_COMMENT + || state == SCE_COFFEESCRIPT_WORD + || state == SCE_COFFEESCRIPT_REGEX); +} + +// Preconditions: sc.currentPos points to a character after '+' or '-'. +// The test for pos reaching 0 should be redundant, +// and is in only for safety measures. +// Limitation: this code will give the incorrect answer for code like +// a = b+++/ptn/... +// Putting a space between the '++' post-inc operator and the '+' binary op +// fixes this, and is highly recommended for readability anyway. +static bool FollowsPostfixOperator(StyleContext &sc, Accessor &styler) { + int pos = (int) sc.currentPos; + while (--pos > 0) { + char ch = styler[pos]; + if (ch == '+' || ch == '-') { + return styler[pos - 1] == ch; + } + } + return false; +} + +static bool followsReturnKeyword(StyleContext &sc, Accessor &styler) { + // Don't look at styles, so no need to flush. + int pos = (int) sc.currentPos; + int currentLine = styler.GetLine(pos); + int lineStartPos = styler.LineStart(currentLine); + while (--pos > lineStartPos) { + char ch = styler.SafeGetCharAt(pos); + if (ch != ' ' && ch != '\t') { + break; + } + } + const char *retBack = "nruter"; + const char *s = retBack; + while (*s + && pos >= lineStartPos + && styler.SafeGetCharAt(pos) == *s) { + s++; + pos--; + } + return !*s; +} + +static void ColouriseCoffeeScriptDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], + Accessor &styler) { + + WordList &keywords = *keywordlists[0]; + WordList &keywords2 = *keywordlists[1]; + WordList &keywords4 = *keywordlists[3]; + + CharacterSet setOKBeforeRE(CharacterSet::setNone, "([{=,:;!%^&*|?~+-"); + CharacterSet setCouldBePostOp(CharacterSet::setNone, "+-"); + + CharacterSet setWordStart(CharacterSet::setAlpha, "_$@", 0x80, true); + CharacterSet setWord(CharacterSet::setAlphaNum, "._$", 0x80, true); + + int chPrevNonWhite = ' '; + int visibleChars = 0; + + // look back to set chPrevNonWhite properly for better regex colouring + int endPos = startPos + length; + if (startPos > 0 && IsSpaceEquiv(initStyle)) { + unsigned int back = startPos; + styler.Flush(); + while (back > 0 && IsSpaceEquiv(styler.StyleAt(--back))) + ; + if (styler.StyleAt(back) == SCE_COFFEESCRIPT_OPERATOR) { + chPrevNonWhite = styler.SafeGetCharAt(back); + } + if (startPos != back) { + initStyle = styler.StyleAt(back); + if (IsSpaceEquiv(initStyle)) { + initStyle = SCE_COFFEESCRIPT_DEFAULT; + } + } + startPos = back; + } + + StyleContext sc(startPos, endPos - startPos, initStyle, styler); + + for (; sc.More(); sc.Forward()) { + + if (sc.atLineStart) { + // Reset states to beginning of colourise so no surprises + // if different sets of lines lexed. + visibleChars = 0; + } + + // Determine if the current state should terminate. + switch (sc.state) { + case SCE_COFFEESCRIPT_OPERATOR: + sc.SetState(SCE_COFFEESCRIPT_DEFAULT); + break; + case SCE_COFFEESCRIPT_NUMBER: + // We accept almost anything because of hex. and number suffixes + if (!setWord.Contains(sc.ch) || sc.Match('.', '.')) { + sc.SetState(SCE_COFFEESCRIPT_DEFAULT); + } + break; + case SCE_COFFEESCRIPT_IDENTIFIER: + if (!setWord.Contains(sc.ch) || (sc.ch == '.') || (sc.ch == '$')) { + char s[1000]; + sc.GetCurrent(s, sizeof(s)); + if (keywords.InList(s)) { + sc.ChangeState(SCE_COFFEESCRIPT_WORD); + } else if (keywords2.InList(s)) { + sc.ChangeState(SCE_COFFEESCRIPT_WORD2); + } else if (keywords4.InList(s)) { + sc.ChangeState(SCE_COFFEESCRIPT_GLOBALCLASS); + } + sc.SetState(SCE_COFFEESCRIPT_DEFAULT); + } + break; + case SCE_COFFEESCRIPT_WORD: + case SCE_COFFEESCRIPT_WORD2: + case SCE_COFFEESCRIPT_GLOBALCLASS: + if (!setWord.Contains(sc.ch)) { + sc.SetState(SCE_COFFEESCRIPT_DEFAULT); + } + break; + case SCE_COFFEESCRIPT_COMMENTLINE: + if (sc.atLineStart) { + sc.SetState(SCE_COFFEESCRIPT_DEFAULT); + } + break; + case SCE_COFFEESCRIPT_STRING: + if (sc.ch == '\\') { + if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') { + sc.Forward(); + } + } else if (sc.ch == '\"') { + sc.ForwardSetState(SCE_COFFEESCRIPT_DEFAULT); + } + break; + case SCE_COFFEESCRIPT_CHARACTER: + if (sc.ch == '\\') { + if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') { + sc.Forward(); + } + } else if (sc.ch == '\'') { + sc.ForwardSetState(SCE_COFFEESCRIPT_DEFAULT); + } + break; + case SCE_COFFEESCRIPT_REGEX: + if (sc.atLineStart) { + sc.SetState(SCE_COFFEESCRIPT_DEFAULT); + } else if (sc.ch == '/') { + sc.Forward(); + while ((sc.ch < 0x80) && islower(sc.ch)) + sc.Forward(); // gobble regex flags + sc.SetState(SCE_COFFEESCRIPT_DEFAULT); + } else if (sc.ch == '\\') { + // Gobble up the quoted character + if (sc.chNext == '\\' || sc.chNext == '/') { + sc.Forward(); + } + } + break; + case SCE_COFFEESCRIPT_STRINGEOL: + if (sc.atLineStart) { + sc.SetState(SCE_COFFEESCRIPT_DEFAULT); + } + break; + case SCE_COFFEESCRIPT_COMMENTBLOCK: + if (sc.Match("###")) { + sc.Forward(); + sc.Forward(); + sc.ForwardSetState(SCE_COFFEESCRIPT_DEFAULT); + } else if (sc.ch == '\\') { + sc.Forward(); + } + break; + case SCE_COFFEESCRIPT_VERBOSE_REGEX: + if (sc.Match("///")) { + sc.Forward(); + sc.Forward(); + sc.ForwardSetState(SCE_COFFEESCRIPT_DEFAULT); + } else if (sc.Match('#')) { + sc.SetState(SCE_COFFEESCRIPT_VERBOSE_REGEX_COMMENT); + } else if (sc.ch == '\\') { + sc.Forward(); + } + break; + case SCE_COFFEESCRIPT_VERBOSE_REGEX_COMMENT: + if (sc.atLineStart) { + sc.SetState(SCE_COFFEESCRIPT_VERBOSE_REGEX); + } + break; + } + + // Determine if a new state should be entered. + if (sc.state == SCE_COFFEESCRIPT_DEFAULT) { + if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) { + sc.SetState(SCE_COFFEESCRIPT_NUMBER); + } else if (setWordStart.Contains(sc.ch)) { + sc.SetState(SCE_COFFEESCRIPT_IDENTIFIER); + } else if (sc.Match("///")) { + sc.SetState(SCE_COFFEESCRIPT_VERBOSE_REGEX); + sc.Forward(); + sc.Forward(); + } else if (sc.ch == '/' + && (setOKBeforeRE.Contains(chPrevNonWhite) + || followsReturnKeyword(sc, styler)) + && (!setCouldBePostOp.Contains(chPrevNonWhite) + || !FollowsPostfixOperator(sc, styler))) { + sc.SetState(SCE_COFFEESCRIPT_REGEX); // JavaScript's RegEx + } else if (sc.ch == '\"') { + sc.SetState(SCE_COFFEESCRIPT_STRING); + } else if (sc.ch == '\'') { + sc.SetState(SCE_COFFEESCRIPT_CHARACTER); + } else if (sc.ch == '#') { + if (sc.Match("###")) { + sc.SetState(SCE_COFFEESCRIPT_COMMENTBLOCK); + sc.Forward(); + sc.Forward(); + } else { + sc.SetState(SCE_COFFEESCRIPT_COMMENTLINE); + } + } else if (isoperator(static_cast<char>(sc.ch))) { + sc.SetState(SCE_COFFEESCRIPT_OPERATOR); + } + } + + if (!IsASpace(sc.ch) && !IsSpaceEquiv(sc.state)) { + chPrevNonWhite = sc.ch; + visibleChars++; + } + } + sc.Complete(); +} + +static bool IsCommentLine(int line, Accessor &styler) { + int pos = styler.LineStart(line); + int eol_pos = styler.LineStart(line + 1) - 1; + for (int i = pos; i < eol_pos; i++) { + char ch = styler[i]; + if (ch == '#') + return true; + else if (ch != ' ' && ch != '\t') + return false; + } + return false; +} + +static void FoldCoffeeScriptDoc(unsigned int startPos, int length, int, + WordList *[], Accessor &styler) { + // A simplified version of FoldPyDoc + const int maxPos = startPos + length; + const int maxLines = styler.GetLine(maxPos - 1); // Requested last line + const int docLines = styler.GetLine(styler.Length() - 1); // Available last line + + // property fold.coffeescript.comment + const bool foldComment = styler.GetPropertyInt("fold.coffeescript.comment") != 0; + + const bool foldCompact = styler.GetPropertyInt("fold.compact") != 0; + + // Backtrack to previous non-blank line so we can determine indent level + // for any white space lines + // and so we can fix any preceding fold level (which is why we go back + // at least one line in all cases) + int spaceFlags = 0; + int lineCurrent = styler.GetLine(startPos); + int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, NULL); + while (lineCurrent > 0) { + lineCurrent--; + indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, NULL); + if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG) + && !IsCommentLine(lineCurrent, styler)) + break; + } + int indentCurrentLevel = indentCurrent & SC_FOLDLEVELNUMBERMASK; + + // Set up initial loop state + int prevComment = 0; + if (lineCurrent >= 1) + prevComment = foldComment && IsCommentLine(lineCurrent - 1, styler); + + // Process all characters to end of requested range + // or comment that hangs over the end of the range. Cap processing in all cases + // to end of document (in case of comment at end). + while ((lineCurrent <= docLines) && ((lineCurrent <= maxLines) || prevComment)) { + + // Gather info + int lev = indentCurrent; + int lineNext = lineCurrent + 1; + int indentNext = indentCurrent; + if (lineNext <= docLines) { + // Information about next line is only available if not at end of document + indentNext = styler.IndentAmount(lineNext, &spaceFlags, NULL); + } + const int comment = foldComment && IsCommentLine(lineCurrent, styler); + const int comment_start = (comment && !prevComment && (lineNext <= docLines) && + IsCommentLine(lineNext, styler) && (lev > SC_FOLDLEVELBASE)); + const int comment_continue = (comment && prevComment); + if (!comment) + indentCurrentLevel = indentCurrent & SC_FOLDLEVELNUMBERMASK; + if (indentNext & SC_FOLDLEVELWHITEFLAG) + indentNext = SC_FOLDLEVELWHITEFLAG | indentCurrentLevel; + + if (comment_start) { + // Place fold point at start of a block of comments + lev |= SC_FOLDLEVELHEADERFLAG; + } else if (comment_continue) { + // Add level to rest of lines in the block + lev = lev + 1; + } + + // Skip past any blank lines for next indent level info; we skip also + // comments (all comments, not just those starting in column 0) + // which effectively folds them into surrounding code rather + // than screwing up folding. + + while ((lineNext < docLines) && + ((indentNext & SC_FOLDLEVELWHITEFLAG) || + (lineNext <= docLines && IsCommentLine(lineNext, styler)))) { + + lineNext++; + indentNext = styler.IndentAmount(lineNext, &spaceFlags, NULL); + } + + const int levelAfterComments = indentNext & SC_FOLDLEVELNUMBERMASK; + const int levelBeforeComments = Platform::Maximum(indentCurrentLevel,levelAfterComments); + + // Now set all the indent levels on the lines we skipped + // Do this from end to start. Once we encounter one line + // which is indented more than the line after the end of + // the comment-block, use the level of the block before + + int skipLine = lineNext; + int skipLevel = levelAfterComments; + + while (--skipLine > lineCurrent) { + int skipLineIndent = styler.IndentAmount(skipLine, &spaceFlags, NULL); + + if (foldCompact) { + if ((skipLineIndent & SC_FOLDLEVELNUMBERMASK) > levelAfterComments) + skipLevel = levelBeforeComments; + + int whiteFlag = skipLineIndent & SC_FOLDLEVELWHITEFLAG; + + styler.SetLevel(skipLine, skipLevel | whiteFlag); + } else { + if ((skipLineIndent & SC_FOLDLEVELNUMBERMASK) > levelAfterComments && + !(skipLineIndent & SC_FOLDLEVELWHITEFLAG) && + !IsCommentLine(skipLine, styler)) + skipLevel = levelBeforeComments; + + styler.SetLevel(skipLine, skipLevel); + } + } + + // Set fold header on non-comment line + if (!comment && !(indentCurrent & SC_FOLDLEVELWHITEFLAG)) { + if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK)) + lev |= SC_FOLDLEVELHEADERFLAG; + } + + // Keep track of block comment state of previous line + prevComment = comment_start || comment_continue; + + // Set fold level for this line and move to next line + styler.SetLevel(lineCurrent, lev); + indentCurrent = indentNext; + lineCurrent = lineNext; + } +} + +static const char *const csWordLists[] = { + "Keywords", + "Secondary keywords", + "Unused" + "Global classes", + 0, +}; + +LexerModule lmCoffeeScript(SCLEX_COFFEESCRIPT, ColouriseCoffeeScriptDoc, "coffeescript", FoldCoffeeScriptDoc, csWordLists); Modified: scintilla/makefile.win32 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -70,6 +70,7 @@ LexBash.o \ LexCOBOL.o \ LexCSS.o \ LexCPP.o \ +LexCoffeeScript.o \ LexHTML.o \ LexOthers.o \ LexPascal.o \ Modified: scintilla/scintilla_changes.patch 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -31,7 +31,7 @@ diff --git b/scintilla/src/Catalogue.cxx a/scintilla/src/Catalogue.cxx index 41d5d54..70ce3bc 100644 --- scintilla/src/Catalogue.cxx +++ scintilla/src/Catalogue.cxx -@@ -76,117 +76,48 @@ int Scintilla_LinkLexers() { +@@ -76,117 +76,49 @@ int Scintilla_LinkLexers() { //++Autogenerated -- run scripts/LexGen.py to regenerate //**$\tLINK_LEXER(\*);\n$ @@ -57,7 +57,7 @@ index 41d5d54..70ce3bc 100644 - LINK_LEXER(lmClwNoCase); LINK_LEXER(lmCmake); LINK_LEXER(lmCOBOL); -- LINK_LEXER(lmCoffeeScript); + LINK_LEXER(lmCoffeeScript); - LINK_LEXER(lmConf); LINK_LEXER(lmCPP); - LINK_LEXER(lmCPPNoCase); Modified: scintilla/src/Catalogue.cxx 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -85,6 +85,7 @@ int Scintilla_LinkLexers() { LINK_LEXER(lmCmake); LINK_LEXER(lmCOBOL); LINK_LEXER(lmCPP); + LINK_LEXER(lmCoffeeScript); LINK_LEXER(lmCss); LINK_LEXER(lmD); LINK_LEXER(lmDiff); Modified: src/filetypes.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -190,6 +190,7 @@ static void init_builtin_filetypes(void) FT_INIT( BATCH, NONE, "Batch", NULL, SCRIPT, SCRIPT ); FT_INIT( POWERSHELL, NONE, "PowerShell", NULL, SOURCE_FILE, SCRIPT ); FT_INIT( RUST, RUST, "Rust", NULL, SOURCE_FILE, COMPILED ); + FT_INIT( COFFEESCRIPT, NONE, "CoffeeScript", NULL, SOURCE_FILE, SCRIPT ); } Modified: src/filetypes.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -100,6 +100,7 @@ typedef enum GEANY_FILETYPES_BATCH, GEANY_FILETYPES_POWERSHELL, GEANY_FILETYPES_RUST, + GEANY_FILETYPES_COFFEESCRIPT, /* ^ append items here */ GEANY_MAX_BUILT_IN_FILETYPES /* Don't use this, use filetypes_array->len instead */ } Modified: src/highlighting.c 12 lines changed, 12 insertions(+), 0 deletions(-) =================================================================== @@ -1001,6 +1001,7 @@ void highlighting_init_styles(guint filetype_idx, GKeyFile *config, GKeyFile *co init_styleset_case(CAML); init_styleset_case(CMAKE); init_styleset_case(COBOL); + init_styleset_case(COFFEESCRIPT); init_styleset_case(CONF); init_styleset_case(CSS); init_styleset_case(D); @@ -1084,6 +1085,7 @@ void highlighting_set_styles(ScintillaObject *sci, GeanyFiletype *ft) styleset_case(CAML); styleset_case(CMAKE); styleset_case(COBOL); + styleset_case(COFFEESCRIPT); styleset_case(CONF); styleset_case(CSS); styleset_case(D); @@ -1538,6 +1540,11 @@ gboolean highlighting_is_string_style(gint lexer, gint style) style == SCE_RUST_BYTESTRING || style == SCE_RUST_BYTESTRINGR || style == SCE_RUST_LEXERROR); + + case SCLEX_COFFEESCRIPT: + return (style == SCE_COFFEESCRIPT_CHARACTER || + style == SCE_COFFEESCRIPT_STRING || + style == SCE_COFFEESCRIPT_STRINGEOL); } return FALSE; } @@ -1698,6 +1705,11 @@ gboolean highlighting_is_comment_style(gint lexer, gint style) style == SCE_RUST_COMMENTLINE || style == SCE_RUST_COMMENTBLOCKDOC || style == SCE_RUST_COMMENTLINEDOC); + + case SCLEX_COFFEESCRIPT: + return (style == SCE_COFFEESCRIPT_COMMENTLINE || + style == SCE_COFFEESCRIPT_COMMENTBLOCK || + style == SCE_COFFEESCRIPT_VERBOSE_REGEX_COMMENT); } return FALSE; } Modified: src/highlightingmappings.h 28 lines changed, 28 insertions(+), 0 deletions(-) =================================================================== @@ -333,6 +333,34 @@ static const HLKeyword highlighting_keywords_CMAKE[] = }; #define highlighting_properties_CMAKE EMPTY_PROPERTIES +/* CoffeeScript */ +#define highlighting_lexer_COFFEESCRIPT SCLEX_COFFEESCRIPT +static const HLStyle highlighting_styles_COFFEESCRIPT[] = +{ + { SCE_COFFEESCRIPT_DEFAULT, "default", FALSE }, + { SCE_COFFEESCRIPT_COMMENTLINE, "commentline", FALSE }, + { SCE_COFFEESCRIPT_NUMBER, "number", FALSE }, + { SCE_COFFEESCRIPT_WORD, "word", FALSE }, + { SCE_COFFEESCRIPT_STRING, "string", FALSE }, + { SCE_COFFEESCRIPT_CHARACTER, "character", FALSE }, + { SCE_COFFEESCRIPT_OPERATOR, "operator", FALSE }, + { SCE_COFFEESCRIPT_IDENTIFIER, "identifier", FALSE }, + { SCE_COFFEESCRIPT_STRINGEOL, "stringeol", FALSE }, + { SCE_COFFEESCRIPT_REGEX, "regex", FALSE }, + { SCE_COFFEESCRIPT_WORD2, "word2", FALSE }, + { SCE_COFFEESCRIPT_GLOBALCLASS, "globalclass", FALSE }, + { SCE_COFFEESCRIPT_COMMENTBLOCK, "commentblock", FALSE }, + { SCE_COFFEESCRIPT_VERBOSE_REGEX, "verbose_regex", FALSE }, + { SCE_COFFEESCRIPT_VERBOSE_REGEX_COMMENT, "verbose_regex_comment",FALSE } +}; +static const HLKeyword highlighting_keywords_COFFEESCRIPT[] = +{ + { 0, "primary", FALSE }, + { 1, "secondary", FALSE }, + { 3, "globalclass", FALSE } +}; +#define highlighting_properties_COFFEESCRIPT EMPTY_PROPERTIES + /* CSS */ #define highlighting_lexer_CSS SCLEX_CSS -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 407484: coffeescript: Recognize string and comment styles
by Colomban Wendling 26 Nov '14

26 Nov '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 26 Nov 2014 18:52:20 UTC Commit: 4074843b42218f59e7b1696f27e8306fd9b6c4ad https://github.com/geany/geany/commit/4074843b42218f59e7b1696f27e8306fd9b6c… Log Message: ----------- coffeescript: Recognize string and comment styles Modified Paths: -------------- src/highlighting.c Modified: src/highlighting.c 10 lines changed, 10 insertions(+), 0 deletions(-) =================================================================== @@ -1540,6 +1540,11 @@ gboolean highlighting_is_string_style(gint lexer, gint style) style == SCE_RUST_BYTESTRING || style == SCE_RUST_BYTESTRINGR || style == SCE_RUST_LEXERROR); + + case SCLEX_COFFEESCRIPT: + return (style == SCE_COFFEESCRIPT_CHARACTER || + style == SCE_COFFEESCRIPT_STRING || + style == SCE_COFFEESCRIPT_STRINGEOL); } return FALSE; } @@ -1700,6 +1705,11 @@ gboolean highlighting_is_comment_style(gint lexer, gint style) style == SCE_RUST_COMMENTLINE || style == SCE_RUST_COMMENTBLOCKDOC || style == SCE_RUST_COMMENTLINEDOC); + + case SCLEX_COFFEESCRIPT: + return (style == SCE_COFFEESCRIPT_COMMENTLINE || + style == SCE_COFFEESCRIPT_COMMENTBLOCK || + style == SCE_COFFEESCRIPT_VERBOSE_REGEX_COMMENT); } return FALSE; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 21e5c0: Fix Scintilla patch for CoffeeScript inclusion
by Colomban Wendling 26 Nov '14

26 Nov '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 26 Nov 2014 18:52:20 UTC Commit: 21e5c0e0e9bf6c28f83af3936836f9fca3e27cc9 https://github.com/geany/geany/commit/21e5c0e0e9bf6c28f83af3936836f9fca3e27… Log Message: ----------- Fix Scintilla patch for CoffeeScript inclusion Modified Paths: -------------- scintilla/scintilla_changes.patch Modified: scintilla/scintilla_changes.patch 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -31,7 +31,7 @@ diff --git b/scintilla/src/Catalogue.cxx a/scintilla/src/Catalogue.cxx index 41d5d54..70ce3bc 100644 --- scintilla/src/Catalogue.cxx +++ scintilla/src/Catalogue.cxx -@@ -76,117 +76,48 @@ int Scintilla_LinkLexers() { +@@ -76,117 +76,49 @@ int Scintilla_LinkLexers() { //++Autogenerated -- run scripts/LexGen.py to regenerate //**$\tLINK_LEXER(\*);\n$ @@ -57,7 +57,7 @@ index 41d5d54..70ce3bc 100644 - LINK_LEXER(lmClwNoCase); LINK_LEXER(lmCmake); LINK_LEXER(lmCOBOL); -- LINK_LEXER(lmCoffeeScript); + LINK_LEXER(lmCoffeeScript); - LINK_LEXER(lmConf); LINK_LEXER(lmCPP); - LINK_LEXER(lmCPPNoCase); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 07002d: Add coffescript syntax highlighting
by Mark Dresselhaus 26 Nov '14

26 Nov '14

Branch: refs/heads/master Author: Mark Dresselhaus <m(a)rk-dresselhaus.de> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 26 Nov 2014 18:52:20 UTC Commit: 07002d252a36b77d150536ffe0c860fa91f4f61d https://github.com/geany/geany/commit/07002d252a36b77d150536ffe0c860fa91f4f… Log Message: ----------- Add coffescript syntax highlighting imported lexer from Scintilla and added coffeescript filetype Modified Paths: -------------- data/Makefile.am data/filetype_extensions.conf data/filetypes.coffeescript scintilla/Makefile.am scintilla/lexers/LexCoffeeScript.cxx scintilla/makefile.win32 scintilla/src/Catalogue.cxx src/filetypes.c src/filetypes.h src/highlighting.c src/highlightingmappings.h Modified: data/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -15,6 +15,7 @@ filetypes = \ filetypes.Clojure.conf \ filetypes.cmake \ filetypes.cobol \ + filetypes.coffeescript \ filetypes.common \ filetypes.conf \ filetypes.cpp \ Modified: data/filetype_extensions.conf 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -16,6 +16,7 @@ CUDA=*.cu;*.cuh;*.h; C#=*.cs; CMake=CMakeLists.txt;*.cmake;*.ctest; COBOL=*.cob;*.cpy;*.cbl;*.cobol; +CoffeeScript=*.coffee;Cakefile;*.Cakefile;*.coffee.erb;*.iced;*.iced.erb Conf=*.conf;*.ini;config;*rc;*.cfg;*.desktop;*.properties; CSS=*.css; Cython=*.pyx;*.pxd;*.pxi; Modified: data/filetypes.coffeescript 48 lines changed, 48 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,48 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +character=character +commentblock=comment +commentline=comment_line +default=default +globalclass=class +identifier=identifier_1 +number=number_1 +operator=operator +regex=regex +string=string_1 +stringeol=string_eol +verbose_regex=regex +verbose_regex_comment=comment +word2=keyword_2 +word=keyword_1 + + +[settings] +extension=coffee +comment_single=# +comment_open=### +comment_close=### +comment_use_indent=true +context_action_cmd= + + +[keywords] +# all items must be in one line +primary=and break by case catch class const continue default delete do each else extends false finally for get if in Infinity instanceof is isnt let loop NaN new no not null of off on or return set switch then this throw true try typeof undefined unless until void when where while with yes yield +secondary=constructor decodeURI decodeURIComponent encodeURI encodeURIComponent eval isFinite isNaN parseFloat parseInt prototype require super +# types, classes +globalclass=Array Boolean Date Error EvalError Function Math Number Object RangeError ReferenceError RegExp String SyntaxError TypeError URIError + +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + +[build-menu] +FT_00_LB=Compile into _Javascript +FT_00_CM=coffee --compile "%f" +FT_01_LB=View compiled _Javascript +FT_01_CM=coffee -p "%f" +EX_00_LB=Run +EX_00_CM=coffee "%f" + Modified: scintilla/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -16,6 +16,7 @@ lexers/LexCPP.cxx \ lexers/LexCSS.cxx \ lexers/LexCaml.cxx \ lexers/LexCmake.cxx \ +lexers/LexCoffeeScript.cxx \ lexers/LexD.cxx \ lexers/LexErlang.cxx \ lexers/LexForth.cxx \ Modified: scintilla/lexers/LexCoffeeScript.cxx 569 lines changed, 569 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,569 @@ +// Scintilla source code edit control +/** @file LexCoffeeScript.cxx + ** Lexer for CoffeeScript. + **/ +// Copyright 1998-2011 by Neil Hodgson <neilh(a)scintilla.org> +// Based on the Scintilla C++ Lexer +// Written by Eric Promislow <ericp(a)activestate.com> in 2011 for the Komodo IDE +// The License.txt file describes the conditions under which this software may be distributed. + +#include <stdlib.h> +#include <string.h> +#include <stdio.h> +#include <stdarg.h> +#include <assert.h> +#include <ctype.h> + +#include "Platform.h" +#include "ILexer.h" +#include "Scintilla.h" +#include "SciLexer.h" + +#include "WordList.h" +#include "LexAccessor.h" +#include "Accessor.h" +#include "StyleContext.h" +#include "CharacterSet.h" +#include "LexerModule.h" + +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif + +static bool IsSpaceEquiv(int state) { + return (state <= SCE_COFFEESCRIPT_COMMENTDOC + // including SCE_COFFEESCRIPT_DEFAULT, SCE_COFFEESCRIPT_COMMENT, SCE_COFFEESCRIPT_COMMENTLINE + || state == SCE_COFFEESCRIPT_COMMENTLINEDOC + || state == SCE_COFFEESCRIPT_COMMENTDOCKEYWORD + || state == SCE_COFFEESCRIPT_COMMENTDOCKEYWORDERROR + || state == SCE_COFFEESCRIPT_COMMENTBLOCK + || state == SCE_COFFEESCRIPT_VERBOSE_REGEX + || state == SCE_COFFEESCRIPT_VERBOSE_REGEX_COMMENT + || state == SCE_COFFEESCRIPT_WORD + || state == SCE_COFFEESCRIPT_REGEX); +} + +// Preconditions: sc.currentPos points to a character after '+' or '-'. +// The test for pos reaching 0 should be redundant, +// and is in only for safety measures. +// Limitation: this code will give the incorrect answer for code like +// a = b+++/ptn/... +// Putting a space between the '++' post-inc operator and the '+' binary op +// fixes this, and is highly recommended for readability anyway. +static bool FollowsPostfixOperator(StyleContext &sc, Accessor &styler) { + int pos = (int) sc.currentPos; + while (--pos > 0) { + char ch = styler[pos]; + if (ch == '+' || ch == '-') { + return styler[pos - 1] == ch; + } + } + return false; +} + +static bool followsReturnKeyword(StyleContext &sc, Accessor &styler) { + // Don't look at styles, so no need to flush. + int pos = (int) sc.currentPos; + int currentLine = styler.GetLine(pos); + int lineStartPos = styler.LineStart(currentLine); + while (--pos > lineStartPos) { + char ch = styler.SafeGetCharAt(pos); + if (ch != ' ' && ch != '\t') { + break; + } + } + const char *retBack = "nruter"; + const char *s = retBack; + while (*s + && pos >= lineStartPos + && styler.SafeGetCharAt(pos) == *s) { + s++; + pos--; + } + return !*s; +} + +static void ColouriseCoffeeScriptDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], + Accessor &styler) { + + WordList &keywords = *keywordlists[0]; + WordList &keywords2 = *keywordlists[1]; + WordList &keywords3 = *keywordlists[2]; + WordList &keywords4 = *keywordlists[3]; + + // property styling.within.preprocessor + // For C++ code, determines whether all preprocessor code is styled in the preprocessor style (0, the default) + // or only from the initial # to the end of the command word(1). + bool stylingWithinPreprocessor = styler.GetPropertyInt("styling.within.preprocessor") != 0; + + CharacterSet setOKBeforeRE(CharacterSet::setNone, "([{=,:;!%^&*|?~+-"); + CharacterSet setCouldBePostOp(CharacterSet::setNone, "+-"); + + CharacterSet setDoxygen(CharacterSet::setAlpha, "$@\\&<>#{}[]"); + + CharacterSet setWordStart(CharacterSet::setAlpha, "_", 0x80, true); + CharacterSet setWord(CharacterSet::setAlphaNum, "._", 0x80, true); + + // property lexer.cpp.allow.dollars + // Set to 0 to disallow the '$' character in identifiers with the cpp lexer. + if (styler.GetPropertyInt("lexer.cpp.allow.dollars", 1) != 0) { + setWordStart.Add('$'); + setWord.Add('$'); + } + + int chPrevNonWhite = ' '; + int visibleChars = 0; + bool lastWordWasUUID = false; + int styleBeforeDCKeyword = SCE_COFFEESCRIPT_DEFAULT; + bool continuationLine = false; + bool isIncludePreprocessor = false; + + if (initStyle == SCE_COFFEESCRIPT_PREPROCESSOR) { + // Set continuationLine if last character of previous line is '\' + int lineCurrent = styler.GetLine(startPos); + if (lineCurrent > 0) { + int chBack = styler.SafeGetCharAt(startPos-1, 0); + int chBack2 = styler.SafeGetCharAt(startPos-2, 0); + int lineEndChar = '!'; + if (chBack2 == '\r' && chBack == '\n') { + lineEndChar = styler.SafeGetCharAt(startPos-3, 0); + } else if (chBack == '\n' || chBack == '\r') { + lineEndChar = chBack2; + } + continuationLine = lineEndChar == '\\'; + } + } + + // look back to set chPrevNonWhite properly for better regex colouring + int endPos = startPos + length; + if (startPos > 0 && IsSpaceEquiv(initStyle)) { + unsigned int back = startPos; + styler.Flush(); + while (back > 0 && IsSpaceEquiv(styler.StyleAt(--back))) + ; + if (styler.StyleAt(back) == SCE_COFFEESCRIPT_OPERATOR) { + chPrevNonWhite = styler.SafeGetCharAt(back); + } + if (startPos != back) { + initStyle = styler.StyleAt(back); + if (IsSpaceEquiv(initStyle)) { + initStyle = SCE_COFFEESCRIPT_DEFAULT; + } + } + startPos = back; + } + + StyleContext sc(startPos, endPos - startPos, initStyle, styler); + + for (; sc.More(); sc.Forward()) { + + if (sc.atLineStart) { + // Reset states to begining of colourise so no surprises + // if different sets of lines lexed. + visibleChars = 0; + lastWordWasUUID = false; + isIncludePreprocessor = false; + } + + // Handle line continuation generically. + if (sc.ch == '\\') { + if (sc.chNext == '\n' || sc.chNext == '\r') { + sc.Forward(); + if (sc.ch == '\r' && sc.chNext == '\n') { + sc.Forward(); + } + continuationLine = true; + continue; + } + } + + // Determine if the current state should terminate. + switch (sc.state) { + case SCE_COFFEESCRIPT_OPERATOR: + sc.SetState(SCE_COFFEESCRIPT_DEFAULT); + break; + case SCE_COFFEESCRIPT_NUMBER: + // We accept almost anything because of hex. and number suffixes + if (!setWord.Contains(sc.ch) || sc.Match('.', '.')) { + sc.SetState(SCE_COFFEESCRIPT_DEFAULT); + } + break; + case SCE_COFFEESCRIPT_IDENTIFIER: + if (!setWord.Contains(sc.ch) || (sc.ch == '.') || (sc.ch == '$')) { + char s[1000]; + sc.GetCurrent(s, sizeof(s)); + if (keywords.InList(s)) { + lastWordWasUUID = strcmp(s, "uuid") == 0; + sc.ChangeState(SCE_COFFEESCRIPT_WORD); + } else if (keywords2.InList(s)) { + sc.ChangeState(SCE_COFFEESCRIPT_WORD2); + } else if (keywords4.InList(s)) { + sc.ChangeState(SCE_COFFEESCRIPT_GLOBALCLASS); + } + sc.SetState(SCE_COFFEESCRIPT_DEFAULT); + } + break; + case SCE_COFFEESCRIPT_WORD: + case SCE_COFFEESCRIPT_WORD2: + case SCE_COFFEESCRIPT_GLOBALCLASS: + if (!setWord.Contains(sc.ch)) { + sc.SetState(SCE_COFFEESCRIPT_DEFAULT); + } + break; + case SCE_COFFEESCRIPT_PREPROCESSOR: + if (sc.atLineStart && !continuationLine) { + sc.SetState(SCE_COFFEESCRIPT_DEFAULT); + } else if (stylingWithinPreprocessor) { + if (IsASpace(sc.ch)) { + sc.SetState(SCE_COFFEESCRIPT_DEFAULT); + } + } else { + if (sc.Match('/', '*') || sc.Match('/', '/')) { + sc.SetState(SCE_COFFEESCRIPT_DEFAULT); + } + } + break; + case SCE_COFFEESCRIPT_COMMENT: + if (sc.Match('*', '/')) { + sc.Forward(); + sc.ForwardSetState(SCE_COFFEESCRIPT_DEFAULT); + } + break; + case SCE_COFFEESCRIPT_COMMENTDOC: + if (sc.Match('*', '/')) { + sc.Forward(); + sc.ForwardSetState(SCE_COFFEESCRIPT_DEFAULT); + } else if (sc.ch == '@' || sc.ch == '\\') { // JavaDoc and Doxygen support + // Verify that we have the conditions to mark a comment-doc-keyword + if ((IsASpace(sc.chPrev) || sc.chPrev == '*') && (!IsASpace(sc.chNext))) { + styleBeforeDCKeyword = SCE_COFFEESCRIPT_COMMENTDOC; + sc.SetState(SCE_COFFEESCRIPT_COMMENTDOCKEYWORD); + } + } + break; + case SCE_COFFEESCRIPT_COMMENTLINE: + if (sc.atLineStart) { + sc.SetState(SCE_COFFEESCRIPT_DEFAULT); + } + break; + case SCE_COFFEESCRIPT_COMMENTLINEDOC: + if (sc.atLineStart) { + sc.SetState(SCE_COFFEESCRIPT_DEFAULT); + } else if (sc.ch == '@' || sc.ch == '\\') { // JavaDoc and Doxygen support + // Verify that we have the conditions to mark a comment-doc-keyword + if ((IsASpace(sc.chPrev) || sc.chPrev == '/' || sc.chPrev == '!') && (!IsASpace(sc.chNext))) { + styleBeforeDCKeyword = SCE_COFFEESCRIPT_COMMENTLINEDOC; + sc.SetState(SCE_COFFEESCRIPT_COMMENTDOCKEYWORD); + } + } + break; + case SCE_COFFEESCRIPT_COMMENTDOCKEYWORD: + if ((styleBeforeDCKeyword == SCE_COFFEESCRIPT_COMMENTDOC) && sc.Match('*', '/')) { + sc.ChangeState(SCE_COFFEESCRIPT_COMMENTDOCKEYWORDERROR); + sc.Forward(); + sc.ForwardSetState(SCE_COFFEESCRIPT_DEFAULT); + } else if (!setDoxygen.Contains(sc.ch)) { + char s[100]; + sc.GetCurrent(s, sizeof(s)); + if (!IsASpace(sc.ch) || !keywords3.InList(s + 1)) { + sc.ChangeState(SCE_COFFEESCRIPT_COMMENTDOCKEYWORDERROR); + } + sc.SetState(styleBeforeDCKeyword); + } + break; + case SCE_COFFEESCRIPT_STRING: + if (isIncludePreprocessor) { + if (sc.ch == '>') { + sc.ForwardSetState(SCE_COFFEESCRIPT_DEFAULT); + isIncludePreprocessor = false; + } + } else if (sc.ch == '\\') { + if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') { + sc.Forward(); + } + } else if (sc.ch == '\"') { + sc.ForwardSetState(SCE_COFFEESCRIPT_DEFAULT); + } + break; + case SCE_COFFEESCRIPT_CHARACTER: + if (sc.ch == '\\') { + if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') { + sc.Forward(); + } + } else if (sc.ch == '\'') { + sc.ForwardSetState(SCE_COFFEESCRIPT_DEFAULT); + } + break; + case SCE_COFFEESCRIPT_REGEX: + if (sc.atLineStart) { + sc.SetState(SCE_COFFEESCRIPT_DEFAULT); + } else if (sc.ch == '/') { + sc.Forward(); + while ((sc.ch < 0x80) && islower(sc.ch)) + sc.Forward(); // gobble regex flags + sc.SetState(SCE_COFFEESCRIPT_DEFAULT); + } else if (sc.ch == '\\') { + // Gobble up the quoted character + if (sc.chNext == '\\' || sc.chNext == '/') { + sc.Forward(); + } + } + break; + case SCE_COFFEESCRIPT_STRINGEOL: + if (sc.atLineStart) { + sc.SetState(SCE_COFFEESCRIPT_DEFAULT); + } + break; + case SCE_COFFEESCRIPT_VERBATIM: + if (sc.ch == '\"') { + if (sc.chNext == '\"') { + sc.Forward(); + } else { + sc.ForwardSetState(SCE_COFFEESCRIPT_DEFAULT); + } + } + break; + case SCE_COFFEESCRIPT_UUID: + if (sc.ch == '\r' || sc.ch == '\n' || sc.ch == ')') { + sc.SetState(SCE_COFFEESCRIPT_DEFAULT); + } + break; + case SCE_COFFEESCRIPT_COMMENTBLOCK: + if (sc.Match("###")) { + sc.Forward(); + sc.Forward(); + sc.ForwardSetState(SCE_COFFEESCRIPT_DEFAULT); + } else if (sc.ch == '\\') { + sc.Forward(); + } + break; + case SCE_COFFEESCRIPT_VERBOSE_REGEX: + if (sc.Match("///")) { + sc.Forward(); + sc.Forward(); + sc.ForwardSetState(SCE_COFFEESCRIPT_DEFAULT); + } else if (sc.Match('#')) { + sc.SetState(SCE_COFFEESCRIPT_VERBOSE_REGEX_COMMENT); + } else if (sc.ch == '\\') { + sc.Forward(); + } + break; + case SCE_COFFEESCRIPT_VERBOSE_REGEX_COMMENT: + if (sc.atLineStart) { + sc.SetState(SCE_COFFEESCRIPT_VERBOSE_REGEX); + } + break; + } + + // Determine if a new state should be entered. + if (sc.state == SCE_COFFEESCRIPT_DEFAULT) { + if (sc.Match('@', '\"')) { + sc.SetState(SCE_COFFEESCRIPT_VERBATIM); + sc.Forward(); + } else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) { + if (lastWordWasUUID) { + sc.SetState(SCE_COFFEESCRIPT_UUID); + lastWordWasUUID = false; + } else { + sc.SetState(SCE_COFFEESCRIPT_NUMBER); + } + } else if (setWordStart.Contains(sc.ch) || (sc.ch == '@') || (sc.ch == '$')) { + if (lastWordWasUUID) { + sc.SetState(SCE_COFFEESCRIPT_UUID); + lastWordWasUUID = false; + } else { + sc.SetState(SCE_COFFEESCRIPT_IDENTIFIER); + } + } else if (sc.Match('/', '*')) { + if (sc.Match("/**") || sc.Match("/*!")) { // Support of Qt/Doxygen doc. style + sc.SetState(SCE_COFFEESCRIPT_COMMENTDOC); + } else { + sc.SetState(SCE_COFFEESCRIPT_COMMENT); + } + sc.Forward(); // Eat the * so it isn't used for the end of the comment + } else if (sc.Match("///")) { + sc.SetState(SCE_COFFEESCRIPT_VERBOSE_REGEX); + sc.Forward(); + sc.Forward(); + } else if (sc.ch == '/' + && (setOKBeforeRE.Contains(chPrevNonWhite) + || followsReturnKeyword(sc, styler)) + && (!setCouldBePostOp.Contains(chPrevNonWhite) + || !FollowsPostfixOperator(sc, styler))) { + sc.SetState(SCE_COFFEESCRIPT_REGEX); // JavaScript's RegEx + } else if (sc.ch == '\"') { + sc.SetState(SCE_COFFEESCRIPT_STRING); + isIncludePreprocessor = false; // ensure that '>' won't end the string + } else if (isIncludePreprocessor && sc.ch == '<') { + sc.SetState(SCE_COFFEESCRIPT_STRING); + } else if (sc.ch == '\'') { + sc.SetState(SCE_COFFEESCRIPT_CHARACTER); + } else if (sc.ch == '#') { + if (sc.Match("###")) { + sc.SetState(SCE_COFFEESCRIPT_COMMENTBLOCK); + sc.Forward(); + sc.Forward(); + + } else { + sc.SetState(SCE_COFFEESCRIPT_COMMENTLINE); + } + } else if (isoperator(static_cast<char>(sc.ch))) { + sc.SetState(SCE_COFFEESCRIPT_OPERATOR); + } + } + + if (!IsASpace(sc.ch) && !IsSpaceEquiv(sc.state)) { + chPrevNonWhite = sc.ch; + visibleChars++; + } + continuationLine = false; + } + sc.Complete(); +} + +static bool IsCommentLine(int line, Accessor &styler) { + int pos = styler.LineStart(line); + int eol_pos = styler.LineStart(line + 1) - 1; + for (int i = pos; i < eol_pos; i++) { + char ch = styler[i]; + if (ch == '#') + return true; + else if (ch == '/' + && i < eol_pos - 1 + && styler[i + 1] == '*') + return true; + else if (ch != ' ' && ch != '\t') + return false; + } + return false; +} + +static void FoldCoffeeScriptDoc(unsigned int startPos, int length, int, + WordList *[], Accessor &styler) { + // A simplified version of FoldPyDoc + const int maxPos = startPos + length; + const int maxLines = styler.GetLine(maxPos - 1); // Requested last line + const int docLines = styler.GetLine(styler.Length() - 1); // Available last line + + // property fold.coffeescript.comment + const bool foldComment = styler.GetPropertyInt("fold.coffeescript.comment") != 0; + + const bool foldCompact = styler.GetPropertyInt("fold.compact") != 0; + + // Backtrack to previous non-blank line so we can determine indent level + // for any white space lines + // and so we can fix any preceding fold level (which is why we go back + // at least one line in all cases) + int spaceFlags = 0; + int lineCurrent = styler.GetLine(startPos); + int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, NULL); + while (lineCurrent > 0) { + lineCurrent--; + indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, NULL); + if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG) + && !IsCommentLine(lineCurrent, styler)) + break; + } + int indentCurrentLevel = indentCurrent & SC_FOLDLEVELNUMBERMASK; + + // Set up initial loop state + int prevComment = 0; + if (lineCurrent >= 1) + prevComment = foldComment && IsCommentLine(lineCurrent - 1, styler); + + // Process all characters to end of requested range + // or comment that hangs over the end of the range. Cap processing in all cases + // to end of document (in case of comment at end). + while ((lineCurrent <= docLines) && ((lineCurrent <= maxLines) || prevComment)) { + + // Gather info + int lev = indentCurrent; + int lineNext = lineCurrent + 1; + int indentNext = indentCurrent; + if (lineNext <= docLines) { + // Information about next line is only available if not at end of document + indentNext = styler.IndentAmount(lineNext, &spaceFlags, NULL); + } + const int comment = foldComment && IsCommentLine(lineCurrent, styler); + const int comment_start = (comment && !prevComment && (lineNext <= docLines) && + IsCommentLine(lineNext, styler) && (lev > SC_FOLDLEVELBASE)); + const int comment_continue = (comment && prevComment); + if (!comment) + indentCurrentLevel = indentCurrent & SC_FOLDLEVELNUMBERMASK; + if (indentNext & SC_FOLDLEVELWHITEFLAG) + indentNext = SC_FOLDLEVELWHITEFLAG | indentCurrentLevel; + + if (comment_start) { + // Place fold point at start of a block of comments + lev |= SC_FOLDLEVELHEADERFLAG; + } else if (comment_continue) { + // Add level to rest of lines in the block + lev = lev + 1; + } + + // Skip past any blank lines for next indent level info; we skip also + // comments (all comments, not just those starting in column 0) + // which effectively folds them into surrounding code rather + // than screwing up folding. + + while ((lineNext < docLines) && + ((indentNext & SC_FOLDLEVELWHITEFLAG) || + (lineNext <= docLines && IsCommentLine(lineNext, styler)))) { + + lineNext++; + indentNext = styler.IndentAmount(lineNext, &spaceFlags, NULL); + } + + const int levelAfterComments = indentNext & SC_FOLDLEVELNUMBERMASK; + const int levelBeforeComments = Platform::Maximum(indentCurrentLevel,levelAfterComments); + + // Now set all the indent levels on the lines we skipped + // Do this from end to start. Once we encounter one line + // which is indented more than the line after the end of + // the comment-block, use the level of the block before + + int skipLine = lineNext; + int skipLevel = levelAfterComments; + + while (--skipLine > lineCurrent) { + int skipLineIndent = styler.IndentAmount(skipLine, &spaceFlags, NULL); + + if (foldCompact) { + if ((skipLineIndent & SC_FOLDLEVELNUMBERMASK) > levelAfterComments) + skipLevel = levelBeforeComments; + + int whiteFlag = skipLineIndent & SC_FOLDLEVELWHITEFLAG; + + styler.SetLevel(skipLine, skipLevel | whiteFlag); + } else { + if ((skipLineIndent & SC_FOLDLEVELNUMBERMASK) > levelAfterComments && + !(skipLineIndent & SC_FOLDLEVELWHITEFLAG) && + !IsCommentLine(skipLine, styler)) + skipLevel = levelBeforeComments; + + styler.SetLevel(skipLine, skipLevel); + } + } + + // Set fold header on non-comment line + if (!comment && !(indentCurrent & SC_FOLDLEVELWHITEFLAG)) { + if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK)) + lev |= SC_FOLDLEVELHEADERFLAG; + } + + // Keep track of block comment state of previous line + prevComment = comment_start || comment_continue; + + // Set fold level for this line and move to next line + styler.SetLevel(lineCurrent, lev); + indentCurrent = indentNext; + lineCurrent = lineNext; + } +} + +static const char *const csWordLists[] = { + "Keywords", + 0, +}; + +LexerModule lmCoffeeScript(SCLEX_COFFEESCRIPT, ColouriseCoffeeScriptDoc, "coffeescript", FoldCoffeeScriptDoc, csWordLists); Modified: scintilla/makefile.win32 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -70,6 +70,7 @@ LexBash.o \ LexCOBOL.o \ LexCSS.o \ LexCPP.o \ +LexCoffeeScript.o \ LexHTML.o \ LexOthers.o \ LexPascal.o \ Modified: scintilla/src/Catalogue.cxx 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -85,6 +85,7 @@ int Scintilla_LinkLexers() { LINK_LEXER(lmCmake); LINK_LEXER(lmCOBOL); LINK_LEXER(lmCPP); + LINK_LEXER(lmCoffeeScript); LINK_LEXER(lmCss); LINK_LEXER(lmD); LINK_LEXER(lmDiff); Modified: src/filetypes.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -190,6 +190,7 @@ static void init_builtin_filetypes(void) FT_INIT( BATCH, NONE, "Batch", NULL, SCRIPT, SCRIPT ); FT_INIT( POWERSHELL, NONE, "PowerShell", NULL, SOURCE_FILE, SCRIPT ); FT_INIT( RUST, RUST, "Rust", NULL, SOURCE_FILE, COMPILED ); + FT_INIT( COFFEESCRIPT, NONE, "CoffeeScript", NULL, SOURCE_FILE, SCRIPT ); } Modified: src/filetypes.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -100,6 +100,7 @@ typedef enum GEANY_FILETYPES_BATCH, GEANY_FILETYPES_POWERSHELL, GEANY_FILETYPES_RUST, + GEANY_FILETYPES_COFFEESCRIPT, /* ^ append items here */ GEANY_MAX_BUILT_IN_FILETYPES /* Don't use this, use filetypes_array->len instead */ } Modified: src/highlighting.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -1001,6 +1001,7 @@ void highlighting_init_styles(guint filetype_idx, GKeyFile *config, GKeyFile *co init_styleset_case(CAML); init_styleset_case(CMAKE); init_styleset_case(COBOL); + init_styleset_case(COFFEESCRIPT); init_styleset_case(CONF); init_styleset_case(CSS); init_styleset_case(D); @@ -1084,6 +1085,7 @@ void highlighting_set_styles(ScintillaObject *sci, GeanyFiletype *ft) styleset_case(CAML); styleset_case(CMAKE); styleset_case(COBOL); + styleset_case(COFFEESCRIPT); styleset_case(CONF); styleset_case(CSS); styleset_case(D); Modified: src/highlightingmappings.h 28 lines changed, 28 insertions(+), 0 deletions(-) =================================================================== @@ -333,6 +333,34 @@ static const HLKeyword highlighting_keywords_CMAKE[] = }; #define highlighting_properties_CMAKE EMPTY_PROPERTIES +/* CoffeeScript */ +#define highlighting_lexer_COFFEESCRIPT SCLEX_COFFEESCRIPT +static const HLStyle highlighting_styles_COFFEESCRIPT[] = +{ + { SCE_COFFEESCRIPT_DEFAULT, "default", FALSE }, + { SCE_COFFEESCRIPT_COMMENTLINE, "commentline", FALSE }, + { SCE_COFFEESCRIPT_NUMBER, "number", FALSE }, + { SCE_COFFEESCRIPT_WORD, "word", FALSE }, + { SCE_COFFEESCRIPT_STRING, "string", FALSE }, + { SCE_COFFEESCRIPT_CHARACTER, "character", FALSE }, + { SCE_COFFEESCRIPT_OPERATOR, "operator", FALSE }, + { SCE_COFFEESCRIPT_IDENTIFIER, "identifier", FALSE }, + { SCE_COFFEESCRIPT_STRINGEOL, "stringeol", FALSE }, + { SCE_COFFEESCRIPT_REGEX, "regex", FALSE }, + { SCE_COFFEESCRIPT_WORD2, "word2", FALSE }, + { SCE_COFFEESCRIPT_GLOBALCLASS, "globalclass", FALSE }, + { SCE_COFFEESCRIPT_COMMENTBLOCK, "commentblock", FALSE }, + { SCE_COFFEESCRIPT_VERBOSE_REGEX, "verbose_regex", FALSE }, + { SCE_COFFEESCRIPT_VERBOSE_REGEX_COMMENT, "verbose_regex_comment",FALSE } +}; +static const HLKeyword highlighting_keywords_COFFEESCRIPT[] = +{ + { 0, "primary", FALSE }, + { 1, "secondary", FALSE }, + { 3, "globalclass", FALSE } +}; +#define highlighting_properties_COFFEESCRIPT EMPTY_PROPERTIES + /* CSS */ #define highlighting_lexer_CSS SCLEX_CSS -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2014