Commits August 2013

commits@lists.geany.org

1 participants
45 discussions

[geany/talks] b71762: Update post with some newer images and change header
by Frank Lanitz 17 Aug '13

17 Aug '13

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sat, 17 Aug 2013 18:06:12 UTC Commit: b71762d16148d87667235e90b6bd7aa97639528e https://github.com/geany/talks/commit/b71762d16148d87667235e90b6bd7aa976395… Log Message: ----------- Update post with some newer images and change header Modified Paths: -------------- german/poster/geany_booth_poster.svg Modified: german/poster/geany_booth_poster.svg 6424 files changed, 4929 insertions(+), 1495 deletions(-) =================================================================== No diff available, check online -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 978fca: Fix our Scintilla patch
by Colomban Wendling 16 Aug '13

16 Aug '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 16 Aug 2013 12:48:31 UTC Commit: 978fca130f6d768354bd745509ace5d24947ad31 https://github.com/geany/geany/commit/978fca130f6d768354bd745509ace5d24947a… Log Message: ----------- Fix our Scintilla patch It got broken by df589a9d52086b22fe1dc7591482f5aa8f9bbc0e -- you have to fix the line change count in the block header too. Modified Paths: -------------- scintilla/scintilla_changes.patch Modified: scintilla/scintilla_changes.patch 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -31,7 +31,7 @@ diff --git b/scintilla/src/Catalogue.cxx a/scintilla/src/Catalogue.cxx index 84d003e..37b2a3c 100644 +++ scintilla/src/Catalogue.cxx --- scintilla/src/Catalogue.cxx -@@ -81,110 +81,46 @@ int Scintilla_LinkLexers() { +@@ -81,110 +81,47 @@ int Scintilla_LinkLexers() { //++Autogenerated -- run src/LexGen.py to regenerate //**$\tLINK_LEXER(\*);\n$ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] f934d2: Update the `create_php_tags.php` script
by Fitorec 16 Aug '13

16 Aug '13

Branch: refs/heads/master Author: Fitorec <chanerec(a)gmail.com> Committer: Matthew Brush <matt(a)geany.org> Date: Fri, 16 Aug 2013 05:24:25 UTC Commit: f934d2cf945dd23e9fe73dc7626719a18c439c26 https://github.com/geany/geany/commit/f934d2cf945dd23e9fe73dc7626719a18c439… Log Message: ----------- Update the `create_php_tags.php` script * Uses more recent URL (as updated in other PR) * Downloads the funcsummary.txt file by itself * Support running the script from any directory Closes #47 Modified Paths: -------------- scripts/create_php_tags.php Modified: scripts/create_php_tags.php 28 files changed, 16 insertions(+), 12 deletions(-) =================================================================== @@ -1,17 +1,14 @@ #!/usr/bin/php - <?php // Author: Matti Mårds // License: GPL V2 or later - +// // Script to generate a new php.tags file from a downloaded PHP function summary list from -// 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://svn.php.net/viewvc/phpdoc/doc-base/trunk/funcsummary.txt?view=co" +// http://svn.php.net/repository/phpdoc/doc-base/trunk/funcsummary.txt // -// (the script should be run in the top source directory) +// - The script can be run from any directory +// - The script downloads the file funcsummary.txt using PHP's stdlib # (from tagmanager/tm_tag.c:32) define("TA_NAME", 200); @@ -23,7 +20,8 @@ define("TYPE_FUNCTION", 128); // Create an array of the lines in the file -$file = file('funcsummary.txt'); +$url = 'http://svn.php.net/repository/phpdoc/doc-base/trunk/funcsummary.txt'; +$file = file($url, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES); // Create template for a tag (tagmanager format) $tagTpl = "%s%c%d%c%s%c%s"; @@ -31,6 +29,13 @@ // String to store the output $tagsOutput = array(); +// String data base path for tags.php +$filePhpTags = implode( DIRECTORY_SEPARATOR, + array( + dirname(dirname(__FILE__)), + 'data', + 'php.tags' + )); // Iterate through each line of the file for($line = 0, $lineCount = count($file); $line < $lineCount; ++$line) { @@ -54,7 +59,6 @@ } // $funcDefMatch['funcName'] = str_replace('::', '->', $funcDefMatch['funcName']); - $tagsOutput[] = sprintf($tagTpl, $funcDefMatch['funcName'], TA_TYPE, TYPE_FUNCTION, TA_ARGLIST, $funcDefMatch['params'], TA_VARTYPE, $funcDefMatch['retType']); } @@ -65,6 +69,6 @@ // Sort the output sort($tagsOutput); -file_put_contents('data/php.tags', join("\n", $tagsOutput)); - -?> +file_put_contents($filePhpTags, join("\n", $tagsOutput)); +echo "Created:\n${filePhpTags}\n"; +echo str_repeat('-',75)."\n"; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 05c9f1: Restore HTML filetype doublestring/hstring to original color
by TheHappyMarquis 16 Aug '13

16 Aug '13

Branch: refs/heads/master Author: TheHappyMarquis <iouri_novak(a)hotmail.com> Committer: Matthew Brush <matt(a)geany.org> Date: Fri, 16 Aug 2013 03:47:35 UTC Commit: 05c9f10dd8d437a4ad078d5bd8a4eb738e79674d https://github.com/geany/geany/commit/05c9f10dd8d437a4ad078d5bd8a4eb738e796… Log Message: ----------- Restore HTML filetype doublestring/hstring to original color Closes #74 and #75 Modified Paths: -------------- data/filetypes.common data/filetypes.html Modified: data/filetypes.common 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -148,7 +148,7 @@ identifier_4=identifier_1 string=0xff8000 string_1=string -string_2=string_1 +string_2=0x008000 string_eol=0x000000;0xe0c0e0;false;false character=string_1 backticks=string_2 Modified: data/filetypes.html 8 files changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -7,7 +7,7 @@ html_attribute=attribute html_attributeunknown=attribute_unknown html_number=number_1 -html_doublestring=string_1 +html_doublestring=string_2 html_singlestring=string_1 html_other=other html_comment=comment @@ -27,7 +27,7 @@ sgml_comment=comment sgml_special=number_1 sgml_command=number_2 -sgml_doublestring=string_1 +sgml_doublestring=string_2 sgml_simplestring=string_1 sgml_1st_param=attribute sgml_entity=entity @@ -37,7 +37,7 @@ php_default=default php_simplestring=string_1 -php_hstring=string_1 +php_hstring=string_2 php_number=number_1 php_word=keyword_1 php_variable=preprocessor @@ -55,7 +55,7 @@ jscript_number=number_1 jscript_word=default jscript_keyword=keyword_1 -jscript_doublestring=string_1 +jscript_doublestring=string_2 jscript_singlestring=string_1 jscript_symbols=operator -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 7d4a29: Add Clojure filetype
by Hoàng Minh Thắng 16 Aug '13

16 Aug '13

Branch: refs/heads/master Author: Hoàng Minh Thắng <p(a)banphim.net> Committer: Matthew Brush <matt(a)geany.org> Date: Fri, 16 Aug 2013 03:12:13 UTC Commit: 7d4a2928b7d020c9d7e330550550f55422b4877b https://github.com/geany/geany/commit/7d4a2928b7d020c9d7e330550550f55422b48… Log Message: ----------- Add Clojure filetype Includes changes in referenced pull request comments. Closes #92 Modified Paths: -------------- data/filetypes.Clojure.conf Modified: data/filetypes.Clojure.conf 42 files changed, 42 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,42 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling=Lisp] + +[keywords] +# all items must be in one line +keywords=* *1 *2 *3 *agent* *allow-unresolved-vars* *assert* *clojure-version* *command-line-args* *compile-files* *compile-path* *e *err* *file* *flush-on-newline* *in* *macro-meta* *math-context* *ns* *out* *print-dup* *print-length* *print-level* *print-meta* *print-readably* *read-eval* *source-path* *use-context-classloader* *warn-on-reflection* + - -> -> ->> ->> .. / < < <= <= = == > > >= >= accessor aclone add-classpath add-watch agent agent-errors aget alength alias all-ns alter alter-meta! alter-var-root amap ancestors and apply areduce array-map aset aset-boolean aset-byte aset-char aset-double aset-float aset-int aset-long aset-short assert assoc assoc! assoc-in associative? atom await await-for await1 bases bean bigdec bigint binding bit-and bit-and-not bit-clear bit-flip bit-not bit-or bit-set bit-shift-left bit-shift-right bit-test bit-xor boolean boolean-array booleans bound-fn bound-fn* butlast byte byte-array bytes cast char char-array char-escape-string char-name-string char? chars chunk chunk-append chunk-buffer chunk-cons chunk-first chunk-next chunk-rest chunked-seq? class class? clear-agent-errors clojure-version coll? comment commute comp comparator compare compare-and-set! compile complement concat cond condp conj conj! cons constantly construct-proxy contains? count counted? create-ns create-struct cycle dec decimal? declare definline defmacro defmethod defmulti defn defn- defonce defstruct delay delay? deliver deref derive descendants destructure disj disj! dissoc dissoc! distinct distinct? doall doc dorun doseq dosync dotimes doto double double-array doubles drop drop-last drop-while empty empty? ensure enumeration-seq eval even? every? false? ffirst file-seq filter find find-doc find-ns find-var first float float-array float? floats flush fn fn? fnext for force format future future-call future-cancel future-cancelled? future-done? future? gen-class gen-interface gensym get get-in get-method get-proxy-class get-thread-bindings get-validator hash hash-map hash-set identical? identity if-let if-not ifn? import in-ns inc init-proxy instance? int int-array integer? interleave intern interpose into into-array ints io! isa? iterate iterator-seq juxt key keys keyword keyword? last lazy-cat lazy-seq let letfn line-seq list list* list? load load-file load-reader load-string loaded-libs locking long long-array longs loop macroexpand macroexpand-1 make-array make-hierarchy map map? mapcat max max-key memfn memoize merge merge-with meta method-sig methods min min-key mod name namespace neg? newline next nfirst nil? nnext not not-any? not-empty not-every? not= ns ns-aliases ns-imports ns-interns ns-map ns-name ns-publics ns-refers ns-resolve ns-unalias ns-unmap nth nthnext num number? odd? or parents partial partition pcalls peek persistent! pmap pop pop! pop-thread-bindings pos? pr pr-str prefer-method prefers primitives-classnames print print-ctor print-doc print-dup print-method print-namespace-doc print-simple print-special-doc print-str printf println println-str prn prn-str promise proxy proxy-call-with-super proxy-mappings proxy-name proxy-super push-thread-bindings pvalues quot rand rand-int range ratio? rational? rationalize re-find re-groups re-matcher re-matches re-pattern re-seq read read-line read-string reduce ref ref-history-count ref-max-history ref-min-history ref-set refer refer-clojure release-pending-sends rem remove remove-method remove-ns remove-watch repeat repeatedly replace replicate require reset! reset-meta! resolve rest resultset-seq reverse reversible? rseq rsubseq second select-keys send send-off seq seq? seque sequence sequential? set set-validator! set? short short-array shorts shutdown-agents slurp some sort sort-by sorted-map sorted-map-by sorted-set sorted-set-by sorted? special-form-anchor special-symbol? split-at split-with str stream? string? struct struct-map subs subseq subvec supers swap! symbol symbol? sync syntax-symbol-anchor take take-last take-nth take-while test the-ns time to-array to-array-2d trampoline transient tree-seq true? type unchecked-add unchecked-dec unchecked-divide unchecked-inc unchecked-multiply unchecked-negate unchecked-remainder unchecked-subtract underive unquote unquote-splicing update-in update-proxy use val vals var-get var-set var? vary-meta vec vector vector? when when-first when-let when-not while with-bindings with-bindings* with-in-str with-loading-context with-local-vars with-meta with-open with-out-str with-precision xml-seq zero? zipmap . .. def do fn if let loop monitor-enter monitor-exit new quote recur set! throw try var + +[settings] +# default extension used when saving files +extension=clj +lexer_filetype=Lisp +# 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=xdg-open "http://clojure.github.com/clojure/clojure.core-api.html#clojure.core/%s" + +[indentation] +width=2 +# 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= +run_cmd=clj "%f" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 4c3730: LexPowerShell fixes and improvements
by Igor Shaula 16 Aug '13

16 Aug '13

Branch: refs/heads/master Author: Igor Shaula <gentoo90(a)gmail.com> Committer: Matthew Brush <matt(a)geany.org> Date: Fri, 16 Aug 2013 02:51:17 UTC Commit: 4c3730caf782d4286e8a84bd0a2c2766013f7c8f https://github.com/geany/geany/commit/4c3730caf782d4286e8a84bd0a2c2766013f7… Log Message: ----------- LexPowerShell fixes and improvements * fix here-string highlighting * add doccomment keyword highlighting * add #region folding Closes #132 Modified Paths: -------------- data/filetypes.powershell scintilla/lexers/LexPowerShell.cxx src/highlightingmappings.h Modified: data/filetypes.powershell 4 files changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -4,7 +4,10 @@ default=default comment=comment commentstream=comment_doc +commentdockeyword=comment_doc_keyword string=string +here_string=string +here_character=character character=character number=number variable=type @@ -22,6 +25,7 @@ keywords=begin break catch continue default do else elseif end filter finally fo cmdlets=add-computer add-content add-history add-member add-pssnapin add-type checkpoint-computer clear-content clear-eventlog clear-history clear-item clear-itemproperty clear-variable compare-object complete-transaction connect-pssession connect-wsman convert-path convertfrom-csv convertfrom-json convertfrom-securestring convertfrom-stringdata convertto-csv convertto-html convertto-json convertto-securestring convertto-xml copy-item copy-itemproperty debug-process disable-computerrestore disable-psbreakpoint disable-psremoting disable-pssessionconfiguration disable-wsmancredssp disconnect-pssession disconnect-wsman enable-computerrestore enable-psbreakpoint enable-psremoting enable-pssessionconfiguration enable-wsmancredssp enter-pssession exit-pssession export-alias export-cimcommand export-clixml export-console export-counter export-csv export-formatdata export-modulemember export-pssession foreach-object format-custom format-list format-table format-wide get-acl get-alias get-authenticodesignature get-childitem get-command get-computerrestorepoint get-content get-controlpanelitem get-counter get-credential get-culture get-date get-event get-eventlog get-eventsubscriber get-executionpolicy get-formatdata get-help get-history get-host get-hotfix get-item get-itemproperty get-job get-location get-member get-module get-pfxcertificate get-process get-psbreakpoint get-pscallstack get-psdrive get-psprovider get-pssession get-pssessionconfiguration get-pssnapin get-random get-service get-tracesource get-transaction get-typedata get-uiculture get-unique get-variable get-winevent get-wmiobject get-wsmancredssp get-wsmaninstance group-object import-alias import-clixml import-counter import-csv import-localizeddata import-module import-pssession invoke-command invoke-expression invoke-history invoke-item invoke-restmethod invoke-webrequest invoke-wmimethod invoke-wsmanaction join-path limit-eventlog measure-command measure-object move-item move-itemproperty new-alias new-event new-eventlog new-item new-itemproperty new-module new-modulemanifest new-object new-psdrive new-pssession new-pssessionconfigurationfile new-pssessionoption new-pstransportoption new-service new-timespan new-variable new-webserviceproxy new-winevent new-wsmaninstance new-wsmansessionoption out-default out-file out-gridview out-host out-null out-printer out-string pop-location push-location read-host receive-job receive-pssession register-engineevent register-jobevent register-objectevent register-pssessionconfiguration register-wmievent remove-computer remove-event remove-eventlog remove-item remove-itemproperty remove-job remove-module remove-psbreakpoint remove-psdrive remove-pssession remove-pssnapin remove-typedata remove-variable remove-wmiobject remove-wsmaninstance rename-computer rename-item rename-itemproperty reset-computermachinepassword resolve-path restart-computer restart-service restore-computer resume-job resume-service save-help select-object select-string select-xml send-mailmessage set-acl set-alias set-authenticodesignature set-content set-date set-executionpolicy set-item set-itemproperty set-location set-psbreakpoint set-psdebug set-pssessionconfiguration set-service set-strictmode set-tracesource set-variable set-wmiinstance set-wsmaninstance set-wsmanquickconfig show-command show-controlpanelitem show-eventlog sort-object split-path start-job start-process start-service start-sleep start-transaction start-transcript stop-computer stop-job stop-process stop-service stop-transcript suspend-job suspend-service tee-object test-computersecurechannel test-connection test-modulemanifest test-path test-pssessionconfigurationfile test-wsman trace-command unblock-file undo-transaction unregister-event unregister-pssessionconfiguration update-formatdata update-help update-list update-typedata use-transaction wait-event wait-job wait-process where-object write-debug write-error write-eventlog write-host write-output write-progress write-verbose write-warning aliases=ac asnp cat cd chdir clc clear clhy cli clp cls clv cnsn compare copy cp cpi cpp cvpa dbp del diff dir dnsn ebp echo epal epcsv epsn erase etsn exsn fc fl ft fw gal gbp gc gci gcm gcs gdr ghy gi gjb gl gm gmo gp gps group gsn gsnp gsv gu gv gwmi h history icm iex ihy ii ipal ipcsv ipmo ipsn irm ise iwmi iwr kill lp ls man md measure mi mount move mp mv nal ndr ni nmo nsn nv ogv oh popd ps pushd pwd r rbp rcjb rcsn rd rdr ren ri rjb rm rmdir rmo rni rnp rp rsn rsnp rujb rv rvpa rwmi sajb sal saps sasv sbp sc select set si sl sleep sls sort sp spjb spps spsv start sujb sv swmi tee type wjb write functions=clear-host get-verb help importsystemmodules mkdir more oss param parameter prompt psedit tabexpansion2 +docComment=component description example externalhelp forwardhelpcategory forwardhelptargetname functionality inputs link notes outputs parameter remotehelprunspace role synopsis user1= [settings] Modified: scintilla/lexers/LexPowerShell.cxx 51 files changed, 49 insertions(+), 2 deletions(-) =================================================================== @@ -40,6 +40,7 @@ static void ColourisePowerShellDoc(unsigned int startPos, int length, int initSt WordList &keywords3 = *keywordlists[2]; WordList &keywords4 = *keywordlists[3]; WordList &keywords5 = *keywordlists[4]; + WordList &keywords6 = *keywordlists[5]; styler.StartAt(startPos); @@ -52,9 +53,26 @@ static void ColourisePowerShellDoc(unsigned int startPos, int length, int initSt sc.SetState(SCE_POWERSHELL_DEFAULT); } } else if (sc.state == SCE_POWERSHELL_COMMENTSTREAM) { + if(sc.atLineStart) { + while(IsASpaceOrTab(sc.ch)) { + sc.Forward(); + } + if (sc.ch == '.' && IsAWordChar(sc.chNext)) { + sc.SetState(SCE_POWERSHELL_COMMENTDOCKEYWORD); + } + } if (sc.ch == '>' && sc.chPrev == '#') { sc.ForwardSetState(SCE_POWERSHELL_DEFAULT); } + } else if (sc.state == SCE_POWERSHELL_COMMENTDOCKEYWORD) { + if(!IsAWordChar(sc.ch)) { + char s[100]; + sc.GetCurrentLowered(s, sizeof(s)); + if (!keywords6.InList(s + 1)) { + sc.ChangeState(SCE_POWERSHELL_COMMENTSTREAM); + } + sc.SetState(SCE_POWERSHELL_COMMENTSTREAM); + } } else if (sc.state == SCE_POWERSHELL_STRING) { // This is a doubles quotes string if (sc.ch == '\"') { @@ -65,6 +83,18 @@ static void ColourisePowerShellDoc(unsigned int startPos, int length, int initSt if (sc.ch == '\'') { sc.ForwardSetState(SCE_POWERSHELL_DEFAULT); } + } else if (sc.state == SCE_POWERSHELL_HERE_STRING) { + // This is a doubles quotes here-string + if (sc.atLineStart && sc.ch == '\"' && sc.chNext == '@') { + sc.Forward(2); + sc.SetState(SCE_POWERSHELL_DEFAULT); + } + } else if (sc.state == SCE_POWERSHELL_HERE_CHARACTER) { + // This is a single quote here-string + if (sc.atLineStart && sc.ch == '\'' && sc.chNext == '@') { + sc.Forward(2); + sc.SetState(SCE_POWERSHELL_DEFAULT); + } } else if (sc.state == SCE_POWERSHELL_NUMBER) { if (!IsADigit(sc.ch)) { sc.SetState(SCE_POWERSHELL_DEFAULT); @@ -107,6 +137,10 @@ static void ColourisePowerShellDoc(unsigned int startPos, int length, int initSt sc.SetState(SCE_POWERSHELL_STRING); } else if (sc.ch == '\'') { sc.SetState(SCE_POWERSHELL_CHARACTER); + } else if (sc.ch == '@' && sc.chNext == '\"') { + sc.SetState(SCE_POWERSHELL_HERE_STRING); + } else if (sc.ch == '@' && sc.chNext == '\'') { + sc.SetState(SCE_POWERSHELL_HERE_CHARACTER); } else if (sc.ch == '$') { sc.SetState(SCE_POWERSHELL_VARIABLE); } else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) { @@ -159,11 +193,23 @@ static void FoldPowerShellDoc(unsigned int startPos, int length, int initStyle, levelNext--; } } else if (foldComment && style == SCE_POWERSHELL_COMMENTSTREAM) { - if (stylePrev != SCE_POWERSHELL_COMMENTSTREAM) { + if (stylePrev != SCE_POWERSHELL_COMMENTSTREAM && stylePrev != SCE_POWERSHELL_COMMENTDOCKEYWORD) { levelNext++; - } else if (styleNext != SCE_POWERSHELL_COMMENTSTREAM) { + } else if (styleNext != SCE_POWERSHELL_COMMENTSTREAM && styleNext != SCE_POWERSHELL_COMMENTDOCKEYWORD) { levelNext--; } + } else if (foldComment && style == SCE_POWERSHELL_COMMENT) { + if (ch == '#') { + unsigned int j = i + 1; + while ((j < endPos) && IsASpaceOrTab(styler.SafeGetCharAt(j))) { + j++; + } + if (styler.Match(j, "region")) { + levelNext++; + } else if (styler.Match(j, "endregion")) { + levelNext--; + } + } } if (!IsASpace(ch)) visibleChars++; @@ -194,6 +240,7 @@ static void FoldPowerShellDoc(unsigned int startPos, int length, int initStyle, "Aliases", "Functions", "User1", + "DocComment", 0 }; Modified: src/highlightingmappings.h 32 files changed, 18 insertions(+), 14 deletions(-) =================================================================== @@ -1160,20 +1160,23 @@ #define highlighting_lexer_POWERSHELL SCLEX_POWERSHELL static const HLStyle highlighting_styles_POWERSHELL[] = { - { SCE_POWERSHELL_DEFAULT, "default", FALSE }, - { SCE_POWERSHELL_COMMENT, "comment", FALSE }, - { SCE_POWERSHELL_STRING, "string", FALSE }, - { SCE_POWERSHELL_CHARACTER, "character", FALSE }, - { SCE_POWERSHELL_NUMBER, "number", FALSE }, - { SCE_POWERSHELL_VARIABLE, "variable", FALSE }, - { SCE_POWERSHELL_OPERATOR, "operator", FALSE }, - { SCE_POWERSHELL_IDENTIFIER, "identifier", FALSE }, - { SCE_POWERSHELL_KEYWORD, "keyword", FALSE }, - { SCE_POWERSHELL_CMDLET, "cmdlet", FALSE }, - { SCE_POWERSHELL_ALIAS, "alias", FALSE }, - { SCE_POWERSHELL_FUNCTION, "function", FALSE }, - { SCE_POWERSHELL_USER1, "user1", FALSE }, - { SCE_POWERSHELL_COMMENTSTREAM, "commentstream", FALSE }, + { SCE_POWERSHELL_DEFAULT, "default", FALSE }, + { SCE_POWERSHELL_COMMENT, "comment", FALSE }, + { SCE_POWERSHELL_STRING, "string", FALSE }, + { SCE_POWERSHELL_CHARACTER, "character", FALSE }, + { SCE_POWERSHELL_NUMBER, "number", FALSE }, + { SCE_POWERSHELL_VARIABLE, "variable", FALSE }, + { SCE_POWERSHELL_OPERATOR, "operator", FALSE }, + { SCE_POWERSHELL_IDENTIFIER, "identifier", FALSE }, + { SCE_POWERSHELL_KEYWORD, "keyword", FALSE }, + { SCE_POWERSHELL_CMDLET, "cmdlet", FALSE }, + { SCE_POWERSHELL_ALIAS, "alias", FALSE }, + { SCE_POWERSHELL_FUNCTION, "function", FALSE }, + { SCE_POWERSHELL_USER1, "user1", FALSE }, + { SCE_POWERSHELL_COMMENTSTREAM, "commentstream", FALSE }, + { SCE_POWERSHELL_HERE_STRING, "here_string", FALSE }, + { SCE_POWERSHELL_HERE_CHARACTER, "here_character", FALSE }, + { SCE_POWERSHELL_COMMENTDOCKEYWORD, "commentdockeyword", FALSE }, }; static const HLKeyword highlighting_keywords_POWERSHELL[] = { @@ -1182,6 +1185,7 @@ { 2, "aliases", FALSE }, { 3, "functions", FALSE }, { 4, "user1", FALSE }, + { 5, "docComment", FALSE }, }; #define highlighting_properties_POWERSHELL EMPTY_PROPERTIES -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] df589a: Add PowerShell filetype
by Igor Shaula 16 Aug '13

16 Aug '13

Branch: refs/heads/master Author: Igor Shaula <gentoo90(a)gmail.com> Committer: Matthew Brush <matt(a)geany.org> Date: Fri, 16 Aug 2013 02:44:33 UTC Commit: df589a9d52086b22fe1dc7591482f5aa8f9bbc0e https://github.com/geany/geany/commit/df589a9d52086b22fe1dc7591482f5aa8f9bb… Log Message: ----------- Add PowerShell filetype Windows PowerShell is a command-line shell and associated scripting language which comes out of the box with Windows 7/Server 2008/8/Server 2012. Original lexer from Scintilla is used. Modified Paths: -------------- data/filetype_extensions.conf data/filetypes.powershell scintilla/Makefile.am scintilla/lexers/LexPowerShell.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/filetype_extensions.conf 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -50,6 +50,7 @@ Perl=*.pl;*.perl;*.pm;*.agi;*.pod; PHP=*.php;*.php3;*.php4;*.php5;*.phtml; Po=*.po;*.pot; Python=*.py;*.pyw;SConstruct;SConscript;wscript; +PowerShell=*.ps1;*.psm1; reStructuredText=*.rest;*.reST;*.rst; R=*.R;*.r; Rust=*.rs Modified: data/filetypes.powershell 55 files changed, 55 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,55 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +# Edit these in the colorscheme .conf file instead +default=default +comment=comment +commentstream=comment_doc +string=string +character=character +number=number +variable=type +operator=operator +identifier=identifier +keyword=keyword +cmdlet=keyword_2 +alias=keyword_2 +function=keyword_2 +user1=keyword_3 + +[keywords] +# all items must be in one line and in lowercase +keywords=begin break catch continue default do else elseif end filter finally for foreach function if in process return trap throw try switch until where while +cmdlets=add-computer add-content add-history add-member add-pssnapin add-type checkpoint-computer clear-content clear-eventlog clear-history clear-item clear-itemproperty clear-variable compare-object complete-transaction connect-pssession connect-wsman convert-path convertfrom-csv convertfrom-json convertfrom-securestring convertfrom-stringdata convertto-csv convertto-html convertto-json convertto-securestring convertto-xml copy-item copy-itemproperty debug-process disable-computerrestore disable-psbreakpoint disable-psremoting disable-pssessionconfiguration disable-wsmancredssp disconnect-pssession disconnect-wsman enable-computerrestore enable-psbreakpoint enable-psremoting enable-pssessionconfiguration enable-wsmancredssp enter-pssession exit-pssession export-alias export-cimcommand export-clixml export-console export-counter export-csv export-formatdata export-modulemember export-pssession foreach-object format-custom format-list format-table format-wide get-acl get-alias get-authenticodesignature get-childitem get-command get-computerrestorepoint get-content get-controlpanelitem get-counter get-credential get-culture get-date get-event get-eventlog get-eventsubscriber get-executionpolicy get-formatdata get-help get-history get-host get-hotfix get-item get-itemproperty get-job get-location get-member get-module get-pfxcertificate get-process get-psbreakpoint get-pscallstack get-psdrive get-psprovider get-pssession get-pssessionconfiguration get-pssnapin get-random get-service get-tracesource get-transaction get-typedata get-uiculture get-unique get-variable get-winevent get-wmiobject get-wsmancredssp get-wsmaninstance group-object import-alias import-clixml import-counter import-csv import-localizeddata import-module import-pssession invoke-command invoke-expression invoke-history invoke-item invoke-restmethod invoke-webrequest invoke-wmimethod invoke-wsmanaction join-path limit-eventlog measure-command measure-object move-item move-itemproperty new-alias new-event new-eventlog new-item new-itemproperty new-module new-modulemanifest new-object new-psdrive new-pssession new-pssessionconfigurationfile new-pssessionoption new-pstransportoption new-service new-timespan new-variable new-webserviceproxy new-winevent new-wsmaninstance new-wsmansessionoption out-default out-file out-gridview out-host out-null out-printer out-string pop-location push-location read-host receive-job receive-pssession register-engineevent register-jobevent register-objectevent register-pssessionconfiguration register-wmievent remove-computer remove-event remove-eventlog remove-item remove-itemproperty remove-job remove-module remove-psbreakpoint remove-psdrive remove-pssession remove-pssnapin remove-typedata remove-variable remove-wmiobject remove-wsmaninstance rename-computer rename-item rename-itemproperty reset-computermachinepassword resolve-path restart-computer restart-service restore-computer resume-job resume-service save-help select-object select-string select-xml send-mailmessage set-acl set-alias set-authenticodesignature set-content set-date set-executionpolicy set-item set-itemproperty set-location set-psbreakpoint set-psdebug set-pssessionconfiguration set-service set-strictmode set-tracesource set-variable set-wmiinstance set-wsmaninstance set-wsmanquickconfig show-command show-controlpanelitem show-eventlog sort-object split-path start-job start-process start-service start-sleep start-transaction start-transcript stop-computer stop-job stop-process stop-service stop-transcript suspend-job suspend-service tee-object test-computersecurechannel test-connection test-modulemanifest test-path test-pssessionconfigurationfile test-wsman trace-command unblock-file undo-transaction unregister-event unregister-pssessionconfiguration update-formatdata update-help update-list update-typedata use-transaction wait-event wait-job wait-process where-object write-debug write-error write-eventlog write-host write-output write-progress write-verbose write-warning +aliases=ac asnp cat cd chdir clc clear clhy cli clp cls clv cnsn compare copy cp cpi cpp cvpa dbp del diff dir dnsn ebp echo epal epcsv epsn erase etsn exsn fc fl ft fw gal gbp gc gci gcm gcs gdr ghy gi gjb gl gm gmo gp gps group gsn gsnp gsv gu gv gwmi h history icm iex ihy ii ipal ipcsv ipmo ipsn irm ise iwmi iwr kill lp ls man md measure mi mount move mp mv nal ndr ni nmo nsn nv ogv oh popd ps pushd pwd r rbp rcjb rcsn rd rdr ren ri rjb rm rmdir rmo rni rnp rp rsn rsnp rujb rv rvpa rwmi sajb sal saps sasv sbp sc select set si sl sleep sls sort sp spjb spps spsv start sujb sv swmi tee type wjb write +functions=clear-host get-verb help importsystemmodules mkdir more oss param parameter prompt psedit tabexpansion2 +user1= + +[settings] +# default extension used when saving files +extension=ps1 + +# 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= + +[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=powershell -file "%f" Modified: scintilla/Makefile.am 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -31,6 +31,7 @@ lexers/LexNsis.cxx \ lexers/LexOthers.cxx \ lexers/LexPascal.cxx \ lexers/LexPerl.cxx \ +lexers/LexPowerShell.cxx \ lexers/LexPython.cxx \ lexers/LexPO.cxx \ lexers/LexR.cxx \ Modified: scintilla/lexers/LexPowerShell.cxx 201 files changed, 201 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,201 @@ +// Scintilla source code edit control +/** @file LexPowerShell.cxx + ** Lexer for PowerShell scripts. + **/ +// Copyright 2008 by Tim Gerundt <tim(a)gerundt.de> +// 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 "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 + +// Extended to accept accented characters +static inline bool IsAWordChar(int ch) { + return ch >= 0x80 || isalnum(ch) || ch == '-' || ch == '_'; +} + +static void ColourisePowerShellDoc(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]; + WordList &keywords5 = *keywordlists[4]; + + styler.StartAt(startPos); + + StyleContext sc(startPos, length, initStyle, styler); + + for (; sc.More(); sc.Forward()) { + + if (sc.state == SCE_POWERSHELL_COMMENT) { + if (sc.atLineEnd) { + sc.SetState(SCE_POWERSHELL_DEFAULT); + } + } else if (sc.state == SCE_POWERSHELL_COMMENTSTREAM) { + if (sc.ch == '>' && sc.chPrev == '#') { + sc.ForwardSetState(SCE_POWERSHELL_DEFAULT); + } + } else if (sc.state == SCE_POWERSHELL_STRING) { + // This is a doubles quotes string + if (sc.ch == '\"') { + sc.ForwardSetState(SCE_POWERSHELL_DEFAULT); + } + } else if (sc.state == SCE_POWERSHELL_CHARACTER) { + // This is a single quote string + if (sc.ch == '\'') { + sc.ForwardSetState(SCE_POWERSHELL_DEFAULT); + } + } else if (sc.state == SCE_POWERSHELL_NUMBER) { + if (!IsADigit(sc.ch)) { + sc.SetState(SCE_POWERSHELL_DEFAULT); + } + } else if (sc.state == SCE_POWERSHELL_VARIABLE) { + if (!IsAWordChar(sc.ch)) { + sc.SetState(SCE_POWERSHELL_DEFAULT); + } + } else if (sc.state == SCE_POWERSHELL_OPERATOR) { + if (!isoperator(static_cast<char>(sc.ch))) { + sc.SetState(SCE_POWERSHELL_DEFAULT); + } + } else if (sc.state == SCE_POWERSHELL_IDENTIFIER) { + if (!IsAWordChar(sc.ch)) { + char s[100]; + sc.GetCurrentLowered(s, sizeof(s)); + + if (keywords.InList(s)) { + sc.ChangeState(SCE_POWERSHELL_KEYWORD); + } else if (keywords2.InList(s)) { + sc.ChangeState(SCE_POWERSHELL_CMDLET); + } else if (keywords3.InList(s)) { + sc.ChangeState(SCE_POWERSHELL_ALIAS); + } else if (keywords4.InList(s)) { + sc.ChangeState(SCE_POWERSHELL_FUNCTION); + } else if (keywords5.InList(s)) { + sc.ChangeState(SCE_POWERSHELL_USER1); + } + sc.SetState(SCE_POWERSHELL_DEFAULT); + } + } + + // Determine if a new state should be entered. + if (sc.state == SCE_POWERSHELL_DEFAULT) { + if (sc.ch == '#') { + sc.SetState(SCE_POWERSHELL_COMMENT); + } else if (sc.ch == '<' && sc.chNext == '#') { + sc.SetState(SCE_POWERSHELL_COMMENTSTREAM); + } else if (sc.ch == '\"') { + sc.SetState(SCE_POWERSHELL_STRING); + } else if (sc.ch == '\'') { + sc.SetState(SCE_POWERSHELL_CHARACTER); + } else if (sc.ch == '$') { + sc.SetState(SCE_POWERSHELL_VARIABLE); + } else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) { + sc.SetState(SCE_POWERSHELL_NUMBER); + } else if (isoperator(static_cast<char>(sc.ch))) { + sc.SetState(SCE_POWERSHELL_OPERATOR); + } else if (IsAWordChar(sc.ch)) { + sc.SetState(SCE_POWERSHELL_IDENTIFIER); + } + } + } + sc.Complete(); +} + +// Store both the current line's fold level and the next lines in the +// level store to make it easy to pick up with each increment +// and to make it possible to fiddle the current level for "} else {". +static void FoldPowerShellDoc(unsigned int startPos, int length, int initStyle, + WordList *[], Accessor &styler) { + bool foldComment = styler.GetPropertyInt("fold.comment") != 0; + bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; + bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) != 0; + unsigned int endPos = startPos + length; + int visibleChars = 0; + int lineCurrent = styler.GetLine(startPos); + int levelCurrent = SC_FOLDLEVELBASE; + if (lineCurrent > 0) + levelCurrent = styler.LevelAt(lineCurrent-1) >> 16; + int levelMinCurrent = levelCurrent; + int levelNext = levelCurrent; + char chNext = styler[startPos]; + int styleNext = styler.StyleAt(startPos); + int style = initStyle; + for (unsigned int i = startPos; i < endPos; i++) { + char ch = chNext; + chNext = styler.SafeGetCharAt(i + 1); + int stylePrev = style; + style = styleNext; + styleNext = styler.StyleAt(i + 1); + bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n'); + if (style == SCE_POWERSHELL_OPERATOR) { + if (ch == '{') { + // Measure the minimum before a '{' to allow + // folding on "} else {" + if (levelMinCurrent > levelNext) { + levelMinCurrent = levelNext; + } + levelNext++; + } else if (ch == '}') { + levelNext--; + } + } else if (foldComment && style == SCE_POWERSHELL_COMMENTSTREAM) { + if (stylePrev != SCE_POWERSHELL_COMMENTSTREAM) { + levelNext++; + } else if (styleNext != SCE_POWERSHELL_COMMENTSTREAM) { + levelNext--; + } + } + if (!IsASpace(ch)) + visibleChars++; + if (atEOL || (i == endPos-1)) { + int levelUse = levelCurrent; + if (foldAtElse) { + levelUse = levelMinCurrent; + } + int lev = levelUse | levelNext << 16; + if (visibleChars == 0 && foldCompact) + lev |= SC_FOLDLEVELWHITEFLAG; + if (levelUse < levelNext) + lev |= SC_FOLDLEVELHEADERFLAG; + if (lev != styler.LevelAt(lineCurrent)) { + styler.SetLevel(lineCurrent, lev); + } + lineCurrent++; + levelCurrent = levelNext; + levelMinCurrent = levelCurrent; + visibleChars = 0; + } + } +} + +static const char * const powershellWordLists[] = { + "Commands", + "Cmdlets", + "Aliases", + "Functions", + "User1", + 0 +}; + +LexerModule lmPowerShell(SCLEX_POWERSHELL, ColourisePowerShellDoc, "powershell", FoldPowerShellDoc, powershellWordLists); + Modified: scintilla/makefile.win32 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -75,6 +75,7 @@ LexOthers.o \ LexPascal.o \ LexPerl.o \ LexPO.o \ +LexPowerShell.o \ LexPython.o \ LexSQL.o \ LexCaml.o \ Modified: scintilla/scintilla_changes.patch 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -111,7 +111,7 @@ index 84d003e..37b2a3c 100644 LINK_LEXER(lmPO); - LINK_LEXER(lmPOV); - LINK_LEXER(lmPowerPro); -- LINK_LEXER(lmPowerShell); + LINK_LEXER(lmPowerShell); - LINK_LEXER(lmProgress); LINK_LEXER(lmProps); - LINK_LEXER(lmPS); Modified: scintilla/src/Catalogue.cxx 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -112,6 +112,7 @@ int Scintilla_LinkLexers() { LINK_LEXER(lmPascal); LINK_LEXER(lmPerl); LINK_LEXER(lmPO); + LINK_LEXER(lmPowerShell); LINK_LEXER(lmProps); LINK_LEXER(lmPython); LINK_LEXER(lmR); Modified: src/filetypes.c 6 files changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -516,6 +516,12 @@ static void init_builtin_filetypes(void) ft->name = g_strdup("Batch"); filetype_make_title(ft, TITLE_FILE); ft->group = GEANY_FILETYPE_GROUP_SCRIPT; + +#define POWERSHELL + ft = filetypes[GEANY_FILETYPES_POWERSHELL]; + ft->name = g_strdup("PowerShell"); + filetype_make_title(ft, TITLE_SOURCE_FILE); + ft->group = GEANY_FILETYPE_GROUP_SCRIPT; } Modified: src/filetypes.h 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -93,6 +93,7 @@ GEANY_FILETYPES_ASCIIDOC, GEANY_FILETYPES_ABAQUS, GEANY_FILETYPES_BATCH, + GEANY_FILETYPES_POWERSHELL, /* ^ append items here */ GEANY_MAX_BUILT_IN_FILETYPES /* Don't use this, use filetypes_array->len instead */ } Modified: src/highlighting.c 2 files changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -1078,6 +1078,7 @@ void highlighting_init_styles(guint filetype_idx, GKeyFile *config, GKeyFile *co init_styleset_case(PERL); init_styleset_case(PHP); init_styleset_case(PO); + init_styleset_case(POWERSHELL); init_styleset_case(PYTHON); init_styleset_case(R); init_styleset_case(RUBY); @@ -1159,6 +1160,7 @@ void highlighting_set_styles(ScintillaObject *sci, GeanyFiletype *ft) styleset_case(PERL); styleset_case(PHP); styleset_case(PO); + styleset_case(POWERSHELL); styleset_case(PYTHON); styleset_case(R); styleset_case(RUBY); Modified: src/highlightingmappings.h 30 files changed, 30 insertions(+), 0 deletions(-) =================================================================== @@ -1156,6 +1156,36 @@ #define highlighting_properties_PO EMPTY_PROPERTIES +/* PowerShell */ +#define highlighting_lexer_POWERSHELL SCLEX_POWERSHELL +static const HLStyle highlighting_styles_POWERSHELL[] = +{ + { SCE_POWERSHELL_DEFAULT, "default", FALSE }, + { SCE_POWERSHELL_COMMENT, "comment", FALSE }, + { SCE_POWERSHELL_STRING, "string", FALSE }, + { SCE_POWERSHELL_CHARACTER, "character", FALSE }, + { SCE_POWERSHELL_NUMBER, "number", FALSE }, + { SCE_POWERSHELL_VARIABLE, "variable", FALSE }, + { SCE_POWERSHELL_OPERATOR, "operator", FALSE }, + { SCE_POWERSHELL_IDENTIFIER, "identifier", FALSE }, + { SCE_POWERSHELL_KEYWORD, "keyword", FALSE }, + { SCE_POWERSHELL_CMDLET, "cmdlet", FALSE }, + { SCE_POWERSHELL_ALIAS, "alias", FALSE }, + { SCE_POWERSHELL_FUNCTION, "function", FALSE }, + { SCE_POWERSHELL_USER1, "user1", FALSE }, + { SCE_POWERSHELL_COMMENTSTREAM, "commentstream", FALSE }, +}; +static const HLKeyword highlighting_keywords_POWERSHELL[] = +{ + { 0, "keywords", FALSE }, + { 1, "cmdlets", FALSE }, + { 2, "aliases", FALSE }, + { 3, "functions", FALSE }, + { 4, "user1", FALSE }, +}; +#define highlighting_properties_POWERSHELL EMPTY_PROPERTIES + + /* Python */ #define highlighting_lexer_PYTHON SCLEX_PYTHON static const HLStyle highlighting_styles_PYTHON[] = -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] d44dfd: Save configuration when plugin manager dialog is closed
by Matthew Brush 16 Aug '13

16 Aug '13

Branch: refs/heads/master Author: Matthew Brush <matt(a)geany.org> Committer: Matthew Brush <matt(a)geany.org> Date: Fri, 16 Aug 2013 01:53:21 UTC Commit: d44dfdb9ac76924c94964545e1f600201e27903c https://github.com/geany/geany/commit/d44dfdb9ac76924c94964545e1f600201e279… Log Message: ----------- Save configuration when plugin manager dialog is closed Closes #62 Modified Paths: -------------- src/plugins.c Modified: src/plugins.c 2 files changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -1393,6 +1393,8 @@ static void pm_dialog_response(GtkDialog *dialog, gint response, gpointer user_d plugin_list = NULL; } gtk_widget_destroy(GTK_WIDGET(dialog)); + + configuration_save(); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] ef7b09: Adding .properties file under Conf markup
by Antoine Turmel 16 Aug '13

16 Aug '13

Branch: refs/heads/master Author: Antoine Turmel <geekshadow(a)gmail.com> Committer: Matthew Brush <matt(a)geany.org> Date: Fri, 16 Aug 2013 01:02:47 UTC Commit: ef7b092ef952abccf023b336c0bd3f03429ea552 https://github.com/geany/geany/commit/ef7b092ef952abccf023b336c0bd3f03429ea… Log Message: ----------- Adding .properties file under Conf markup See http://en.wikipedia.org/wiki/.properties Closes #162 Modified Paths: -------------- data/filetype_extensions.conf Modified: data/filetype_extensions.conf 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -16,7 +16,7 @@ CUDA=*.cu;*.cuh;*.h; C#=*.cs; CMake=CMakeLists.txt;*.cmake;*.ctest; COBOL=*.cob;*.cpy;*.cbl;*.cobol; -Conf=*.conf;*.ini;config;*rc;*.cfg;*.desktop; +Conf=*.conf;*.ini;config;*rc;*.cfg;*.desktop;*.properties; CSS=*.css; Cython=*.pyx;*.pxd;*.pxi; D=*.d;*.di; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 1a185d: Add CUDA C/C++ support
by Benjamin Chrétien 16 Aug '13

16 Aug '13

Branch: refs/heads/master Author: Benjamin Chrétien <chretien(a)lirmm.fr> Committer: Matthew Brush <matt(a)geany.org> Date: Fri, 16 Aug 2013 00:55:36 UTC Commit: 1a185d87a4e40a2b361bfa6c469190b7a3cfd927 https://github.com/geany/geany/commit/1a185d87a4e40a2b361bfa6c469190b7a3cfd… Log Message: ----------- Add CUDA C/C++ support Closes #147 Modified Paths: -------------- data/filetype_extensions.conf data/filetypes.CUDA.conf Modified: data/filetype_extensions.conf 5 files changed, 3 insertions(+), 2 deletions(-) =================================================================== @@ -1,5 +1,5 @@ # Filetype extension configuration file for Geany -# Insert as many items as you want, seperate them with a ";". +# Insert as many items as you want, separate them with a ";". # See Geany's main documentation for details. [Extensions] Abaqus=*.inp; @@ -12,6 +12,7 @@ Batch=*.bat;*.cmd;*.nt; CAML=*.ml;*.mli; C=*.c;*.h; C++=*.cpp;*.cxx;*.c++;*.cc;*.h;*.hpp;*.hxx;*.h++;*.hh;*.C;*.H; +CUDA=*.cu;*.cuh;*.h; C#=*.cs; CMake=CMakeLists.txt;*.cmake;*.ctest; COBOL=*.cob;*.cpy;*.cbl;*.cobol; @@ -67,7 +68,7 @@ None=*; # Note: restarting is required after editing groups [Groups] -Programming=Cython;Genie;Go;Rust;Scala; +Programming=CUDA;Cython;Genie;Go;Rust;Scala; Script=Graphviz; Markup= Misc= Modified: data/filetypes.CUDA.conf 60 files changed, 60 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,60 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling=C] + +[keywords] +# all items must be in one line +primary=alignas alignof and and_eq asm auto bitand bitor bool break case catch char char16_t char32_t class compl const const_cast constexpr continue decltype default delete do double dynamic_cast else enum explicit export extern false final float for friend goto if inline int int8_t int16_t int32_t int64_t long mutable namespace new noexcept not not_eq nullptr operator or or_eq override private protected ptrdiff_t public register reinterpret_cast return short signed sizeof size_t static static_assert static_cast struct switch template this thread_local throw true try typedef typeid typename union unsigned using virtual void volatile wchar_t while xor xor_eq + +# CUDA keywords set as secondary keywords +secondary=__device__ __global__ __shared__ __host__ __constant__ gridDim blockIdx blockDim threadIdx warpSize <<< >>> dim3 char1 uchar1 char2 uchar2 char3 uchar3 char4 uchar4 short1 ushort1 short2 ushort2 short3 ushort3 short4 ushort4 int1 uint1 int2 uint2 int3 uint3 int4 uint4 long1 ulong1 long2 ulong2 long3 ulong3 long4 ulong4 float1 float2 float3 float4 double1 double2 + +# these are the Doxygen keywords +docComment=a addindex addtogroup anchor arg attention author authors b brief bug c callergraph callgraph category cite class code cond copybrief copydetails copydoc copyright date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endinternal endlatexonly endlink endmanonly endmsc endrtfonly endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc mscfile n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref related relatedalso relates relatesalso remark remarks result return returns retval rtfonly sa section see short showinitializer since skip skipline snippet struct subpage subsection subsubsection tableofcontents test throw throws todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem + +[lexer_properties] +styling.within.preprocessor=1 +lexer.cpp.track.preprocessor=0 +preprocessor.symbol.$(file.patterns.cpp)=# +preprocessor.start.$(file.patterns.cpp)=if ifdef ifndef +preprocessor.middle.$(file.patterns.cpp)=else elif +preprocessor.end.$(file.patterns.cpp)=endif + +[settings] +lexer_filetype=C + +# default extension used when saving files +extension=cu + +# 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_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=nvcc -c "%f" +linker=nvcc -o "%e" "%f" +run_cmd="./%e" + -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2013