Commits August 2013

commits@lists.geany.org

1 participants
45 discussions

[geany/geany] 706abf: Add detection of PKGBUILD files as Shell scripts
by YosefOr 16 Aug '13

16 Aug '13

Branch: refs/heads/master Author: YosefOr <yosefor3(a)walla.com> Committer: Matthew Brush <matt(a)geany.org> Date: Thu, 15 Aug 2013 22:21:42 UTC Commit: 706abfbf38c602fe1ec99d2b25e9ca150f3f24d0 https://github.com/geany/geany/commit/706abfbf38c602fe1ec99d2b25e9ca150f3f2… Log Message: ----------- Add detection of PKGBUILD files as Shell scripts Closes #120 Modified Paths: -------------- data/filetype_extensions.conf Modified: data/filetype_extensions.conf 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -54,7 +54,7 @@ R=*.R;*.r; Rust=*.rs Ruby=*.rb;*.rhtml;*.ruby;*.gemspec;Gemfile;rakefile;Rakefile; Scala=*.scala;*.scl; -Sh=*.sh;configure;configure.in;configure.in.in;configure.ac;*.ksh;*.mksh;*.zsh;*.ash;*.bash;*.m4;*profile; +Sh=*.sh;configure;configure.in;configure.in.in;configure.ac;*.ksh;*.mksh;*.zsh;*.ash;*.bash;*.m4;PKGBUILD;*profile; SQL=*.sql; Tcl=*.tcl;*.tk;*.wish; Txt2tags=*.t2t; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 9e22ec: Added Graphviz custom filetype
by Miro Hrončok 16 Aug '13

16 Aug '13

Branch: refs/heads/master Author: Miro Hrončok <miro(a)hroncok.cz> Committer: Matthew Brush <matt(a)geany.org> Date: Thu, 15 Aug 2013 22:10:45 UTC Commit: 9e22ec85359ef97c1995f233f615767bb97a341a https://github.com/geany/geany/commit/9e22ec85359ef97c1995f233f615767bb97a3… Log Message: ----------- Added Graphviz custom filetype Closes #125 Modified Paths: -------------- data/filetype_extensions.conf data/filetypes.Graphviz.conf Modified: data/filetype_extensions.conf 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -30,6 +30,7 @@ FreeBasic=*.bas;*.bi; Genie=*.gs; GLSL=*.glsl;*.frag;*.vert; Go=*.go; +Graphviz=*.gv;*.dot; Haskell=*.hs;*.lhs;*.hs-boot;*.lhs-boot; Haxe=*.hx; HTML=*.htm;*.html;*.shtml;*.hta;*.htd;*.htt;*.cfm; @@ -67,7 +68,7 @@ None=*; # Note: restarting is required after editing groups [Groups] Programming=Cython;Genie;Go;Rust;Scala; -Script= +Script=Graphviz; Markup= Misc= None= Modified: data/filetypes.Graphviz.conf 59 files changed, 59 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,59 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling=C] + +[keywords] +# all items must be in one line +primary=digraph graph node edge subgraph strict +secondary=Damping K URL area arrowhead arrowsize arrowtail aspect bb bgcolor colorList center charset clusterrank color colorList colorscheme comment compound concentrate constraint decorate defaultdist dim dimen dir diredgeconstraints distortion dpi edgeURL edgehref edgetarget edgetooltip epsilon esep fillcolor colorList fixedsize fontcolor fontname fontnames fontpath fontsize forcelabels gradientangle group headURL head_lp headclip headhref headlabel headport headtarget headtooltip height href id image imagepath imagescale label labelURL label_scheme labelangle labeldistance labelfloat labelfontcolor labelfontname labelfontsize labelhref labeljust labelloc labeltarget labeltooltip landscape layer layerlistsep layers layerselect layersep layout len levels levelsgap lhead lheight lp ltail lwidth margin maxiter mclimit mindist minlen mode model mosek nodesep nojustify normalize nslimit nslimit1 ordering orientation orientation outputorder overlap overlap_scaling pack packmode pad point page point pagedir pencolor penwidth peripheries pin pos splineType quadtree quantum rank rankdir ranksep ratio rects regular remincross repulsiveforce resolution root rotate rotation samehead sametail samplepoints scale searchsize sep shape shapefile showboxes sides size skew smoothing sortv splines start style stylesheet tailURL tail_lp tailclip tailhref taillabel tailport tailtarget tailtooltip target tooltip truecolor vertices viewport voro_margin weight width xlabel xlp z + +# these are the Doxygen keywords +docComment= +[lexer_properties] +styling.within.preprocessor=0 +lexer.cpp.track.preprocessor=0 +preprocessor.symbol.$(file.patterns.cpp)=# + +[settings] +lexer_filetype=C +# default extension used when saving files +extension=gv + +# the following characters are these which a "word" can contains, see documentation +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 + +# single comments, like # in this file +comment_single=// +# multiline comments +comment_open=/* +comment_close=*/ + +# set to false if a comment character/string should start at column 0 of a line, true uses any +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d + #command_example(); +# setting to false would generate this +# command_example(); +# This setting works only for single line comments +comment_use_indent=true + +# context action command (please see Geany's main documentation for details) +context_action_cmd= + +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + +[build-menu] +FT_00_LB=Graphviz -> _SVG +FT_00_CM=dot -Tsvg -O "%f" +FT_00_BD=false +FT_01_LB=Graphviz -> _EPS +FT_01_CM=dot -Teps -O "%f" +FT_01_BD=false +EX_00_LB=V_iew SVG File +EX_00_CM=exo-open "%f.svg" +EX_00_BD=false +EX_01_LB=_View EPS File +EX_01_CM=exo-open "%f.eps" +EX_01_BD=false + -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] b11a3a: Add detection support for various Shell scripts
by Ypnose 15 Aug '13

15 Aug '13

Branch: refs/heads/master Author: Ypnose <linuxien(a)legtux.org> Committer: Matthew Brush <matt(a)geany.org> Date: Thu, 15 Aug 2013 21:48:06 UTC Commit: b11a3adb7bc4f04d3cfc7b7a40cf8e3704dde523 https://github.com/geany/geany/commit/b11a3adb7bc4f04d3cfc7b7a40cf8e3704dde… Log Message: ----------- Add detection support for various Shell scripts * Add shebang detection of mksh and tcsh. * Add file extension detection of mksh, tcsh, and the various "profile" shell scripts. Closes #126 Modified Paths: -------------- data/filetype_extensions.conf src/filetypes.c Modified: data/filetype_extensions.conf 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -53,7 +53,7 @@ R=*.R;*.r; Rust=*.rs Ruby=*.rb;*.rhtml;*.ruby;*.gemspec;Gemfile;rakefile;Rakefile; Scala=*.scala;*.scl; -Sh=*.sh;configure;configure.in;configure.in.in;configure.ac;*.ksh;*.zsh;*.ash;*.bash;*.m4; +Sh=*.sh;configure;configure.in;configure.in.in;configure.ac;*.ksh;*.mksh;*.zsh;*.ash;*.bash;*.m4;*profile; SQL=*.sql; Tcl=*.tcl;*.tk;*.wish; Txt2tags=*.t2t; Modified: src/filetypes.c 2 files changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -925,7 +925,9 @@ static GeanyFiletype *find_shebang(const gchar *utf8_filename, const gchar *line { "make", GEANY_FILETYPES_MAKE }, { "zsh", GEANY_FILETYPES_SH }, { "ksh", GEANY_FILETYPES_SH }, + { "mksh", GEANY_FILETYPES_SH }, { "csh", GEANY_FILETYPES_SH }, + { "tcsh", GEANY_FILETYPES_SH }, { "ash", GEANY_FILETYPES_SH }, { "dmd", GEANY_FILETYPES_D }, { "wish", GEANY_FILETYPES_TCL }, -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 01b719: Added hashbang detection for node=>javascript.
by Edward Hutchins 15 Aug '13

15 Aug '13

Branch: refs/heads/master Author: Edward Hutchins <eahutchins(a)gmail.com> Committer: Matthew Brush <matt(a)geany.org> Date: Thu, 15 Aug 2013 20:54:44 UTC Commit: 01b7191d661c5a2abbf521eeccaa9dcb0ed4adf0 https://github.com/geany/geany/commit/01b7191d661c5a2abbf521eeccaa9dcb0ed4a… Log Message: ----------- Added hashbang detection for node=>javascript. Closes #149 Modified Paths: -------------- src/filetypes.c Modified: src/filetypes.c 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -928,7 +928,8 @@ static GeanyFiletype *find_shebang(const gchar *utf8_filename, const gchar *line { "csh", GEANY_FILETYPES_SH }, { "ash", GEANY_FILETYPES_SH }, { "dmd", GEANY_FILETYPES_D }, - { "wish", GEANY_FILETYPES_TCL } + { "wish", GEANY_FILETYPES_TCL }, + { "node", GEANY_FILETYPES_JS } }; gchar *tmp = g_path_get_basename(line + 2); gchar *basename_interpreter = tmp; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 03e3ba: Added keywords for Matlab classes syntax highlight
by Felix Totir 15 Aug '13

15 Aug '13

Branch: refs/heads/master Author: Felix Totir <axeoth(a)yahoo.fr> Committer: Matthew Brush <matt(a)geany.org> Date: Thu, 15 Aug 2013 20:21:41 UTC Commit: 03e3ba798748bcc5186dedaaaa5871faf6527322 https://github.com/geany/geany/commit/03e3ba798748bcc5186dedaaaa5871faf6527… Log Message: ----------- Added keywords for Matlab classes syntax highlight Closes #136 Modified Paths: -------------- data/filetypes.matlab Modified: data/filetypes.matlab 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -13,7 +13,7 @@ doublequotedstring=string_2 [keywords] # all items must be in one line -primary=break case catch continue else elseif end for function global if otherwise persistent return switch try while +primary=break case catch classdef continue else elseif end enumeration events for function global if methods otherwise persistent properties return switch try while [settings] # default extension used when saving files -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] a1e920: Update PHP source repo for tags and tags file
by John Long 15 Aug '13

15 Aug '13

Branch: refs/heads/master Author: John Long <a(a)88k.us> Committer: Matthew Brush <matt(a)geany.org> Date: Thu, 15 Aug 2013 20:09:35 UTC Commit: a1e920527086984ebfe2643e3daa6c6fa22bf7d0 https://github.com/geany/geany/commit/a1e920527086984ebfe2643e3daa6c6fa22bf… Log Message: ----------- Update PHP source repo for tags and tags file The new tags file seems to have lots of new symbols. It needs testing by PHP programmers. Closes #137 Modified Paths: -------------- data/php.tags scripts/create_php_tags.php Modified: data/php.tags 6551 files changed, 4295 insertions(+), 2256 deletions(-) =================================================================== No diff available, check online Modified: scripts/create_php_tags.php 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -5,11 +5,11 @@ // License: GPL V2 or later // Script to generate a new php.tags file from a downloaded PHP function summary list from -// http://cvs.php.net/viewvc.cgi/phpdoc/funcsummary.txt?view=co +// http://svn.php.net/viewvc/phpdoc/doc-base/trunk/funcsummary.txt?view=co // The script expects a file funcsummary.txt in /tmp and will write the parsed tags into // data/php.tags. // -// wget -O funcsummary.txt "http://cvs.php.net/viewvc.cgi/phpdoc/funcsummary.txt?view=co" +// wget -O funcsummary.txt "http://svn.php.net/viewvc/phpdoc/doc-base/trunk/funcsummary.txt?view=co" // // (the script should be run in the top source directory) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] c615d8: Don't call getenv twice
by Nick Treleaven 15 Aug '13

15 Aug '13

Branch: refs/heads/master Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Thu, 15 Aug 2013 16:52:13 UTC Commit: c615d8431fa2cf808ec692f1c605834186a39c08 https://github.com/geany/geany/commit/c615d8431fa2cf808ec692f1c605834186a39… Log Message: ----------- Don't call getenv twice Modified Paths: -------------- src/symbols.c Modified: src/symbols.c 5 files changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1784,7 +1784,10 @@ int symbols_generate_global_tags(int argc, char **argv, gboolean want_preprocess load_c_ignore_tags(); if (want_preprocess && (ft->id == GEANY_FILETYPES_C || ft->id == GEANY_FILETYPES_CPP)) - command = g_strdup_printf("%s %s", pre_process, FALLBACK(getenv("CFLAGS"), "")); + { + const gchar *cflags = getenv("CFLAGS"); + command = g_strdup_printf("%s %s", pre_process, FALLBACK(cflags, "")); + } else command = NULL; /* don't preprocess */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 010136: PHP: Add strings tests
by Colomban Wendling 15 Aug '13

15 Aug '13

1 0

[geany/geany] 6063e0: PHP: Recognize vertical tab (\v) and form-feed (\f) as whitespaces
by Colomban Wendling 15 Aug '13

15 Aug '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 15 Aug 2013 12:51:28 UTC Commit: 6063e077c37230d03ca4d7fd1844e9a3dea25a77 https://github.com/geany/geany/commit/6063e077c37230d03ca4d7fd1844e9a3dea25… Log Message: ----------- PHP: Recognize vertical tab (\v) and form-feed (\f) as whitespaces Even though PHP doesn't handle those very well (it emits warnings about "unexpected character"), it still counts them as whitespaces, so properly handle them as such. Modified Paths: -------------- tagmanager/ctags/php.c tests/ctags/Makefile.am tests/ctags/whitespaces.php tests/ctags/whitespaces.php.tags Modified: tagmanager/ctags/php.c 18 files changed, 9 insertions(+), 9 deletions(-) =================================================================== @@ -672,9 +672,15 @@ static keywordId analyzeToken (vString *const name, langType language) return result; } +static boolean isSpace (int c) +{ + return (c == '\t' || c == ' ' || c == '\v' || + c == '\n' || c == '\r' || c == '\f'); +} + static int skipWhitespaces (int c) { - while (c == '\t' || c == ' ' || c == '\n' || c == '\r') + while (isSpace (c)) c = fileGetc (); return c; } @@ -695,10 +701,7 @@ static boolean isOpenScriptLanguagePhp (int c) tolower ((c = fileGetc ())) != 'i' || tolower ((c = fileGetc ())) != 'p' || tolower ((c = fileGetc ())) != 't' || - ((c = fileGetc ()) != '\t' && - c != ' ' && - c != '\n' && - c != '\r') || + ! isSpace ((c = fileGetc ())) || tolower ((c = skipWhitespaces (c))) != 'l' || tolower ((c = fileGetc ())) != 'a' || tolower ((c = fileGetc ())) != 'n' || @@ -806,10 +809,7 @@ static void readToken (tokenInfo *const token) else c = fileGetc (); - while (c == '\t' || c == ' ' || c == '\n' || c == '\r') - { - c = fileGetc (); - } + c = skipWhitespaces (c); token->lineNumber = getSourceLineNumber (); token->filePosition = getInputFilePosition (); Modified: tests/ctags/Makefile.am 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -231,6 +231,7 @@ test_sources = \ traits.php \ union.f \ value.f \ + whitespaces.php \ $(NULL) test_results = $(test_sources:=.tags) Modified: tests/ctags/whitespaces.php 34 files changed, 34 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,34 @@ +<?php + +function a () {} + +function +b +() +{} + +functionc(){} + +functiond(){} + +function e () {} + +function f () {} + +function + g + () + {} + +function h(){} + + +/* for live PHP tests */ +var_dump(a()); +var_dump(b()); +var_dump(c()); +var_dump(d()); +var_dump(e()); +var_dump(f()); +var_dump(g()); +var_dump(h()); Modified: tests/ctags/whitespaces.php.tags 9 files changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,9 @@ +# format=tagmanager +a�16�()�0 +b�16�()�0 +c�16�()�0 +d�16�()�0 +e�16�()�0 +f�16�()�0 +g�16�()�0 +h�16�()�0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 17f9da: Update our Scintilla patch for Batch lexer
by Colomban Wendling 15 Aug '13

15 Aug '13

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2013