HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,277 Commits 1 Branch 0 Tags
Commit Graph

35 Commits

Author SHA1 Message Date
Colomban Wendling
b96d22374a Make HTML filetype the "primary" one XML and PHP inherits from 
XML used to be the one holding the actual definitions, but the HTML
filetype is actually superset of XML (XML filetypes had definitions
for non-XML things), and most definitions names referenced HTML rather
than XML.

So, move the actual definitions from filetypes.xml to filetypes.html
and make XML and PHP inherit from HTML.
 2011-11-09 22:59:56 +01:00
Colomban Wendling
ad1bc032ab Port XML, HTML and PHP filetypes to new automated setup 
This changes these three filetypes to "normal" ones rather than HTML
and PHP being hard-coded together with XML.  Now the definitions
simply references each other and the filetypes.* files simply inherits
styling and keywords from the appropriate filetype.

This also makes these filetypes have their own Python styles like they
had their own JavaScript ones, rather than trickily reference the
Python ones.
 2011-11-09 22:50:26 +01:00
Matthew Brush
f6e135435b Fixup various filedefs mappings 2011-10-23 13:44:52 -07:00
Matthew Brush
dc9ba7d074 Improve highlighting for PHP and JS 2011-10-15 14:28:22 -07:00
Matthew Brush
9b508b712a Fix typo in comment in many filedefs. 2011-10-11 15:33:40 -07:00
Matthew Brush
7ebdacac2d Make all filetypes.* files use named styles. 
Fix colorschemes/alt.conf to use the new changes.
 2011-10-10 20:35:05 -07:00
Colomban Wendling
18388077e6 Add support for filetype-specific indentation settings 
Closes #3339420 and #3390435.

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5902 ea778897-0a13-0410-b9d1-a72fbfd435f5
 2011-08-25 20:14:17 +00:00
Dominic Hopf
ce42ed410a add PHP 5.4 keywords insteadof and trait (patch by Felipe Pena, thanks) 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5867 ea778897-0a13-0410-b9d1-a72fbfd435f5
 2011-07-22 14:49:07 +00:00
Colomban Wendling
441bab9d3b Add new filetype setting "comment_single" 
This provides separated single-line and multiline comment support.

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5609 ea778897-0a13-0410-b9d1-a72fbfd435f5
 2011-03-20 15:02:22 +00:00
Enrico Tröger
f3914355aa Add 'instanceif' keyword for PHP (closes #3109330). 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5420 ea778897-0a13-0410-b9d1-a72fbfd435f5
 2010-11-21 17:40:08 +00:00
Nick Treleaven
118386a7d0 Enable XML tag autoindentation for PHP, Docbook and add docs for 
this setting (patch by Eugene Arshinov, thanks).



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5402 ea778897-0a13-0410-b9d1-a72fbfd435f5
 2010-11-11 17:58:21 +00:00
Nick Treleaven
eba0571fb6 Add xml_indent_tags filetype setting for documents using the 
HTML/XML lexers (patch by Eugene Arshinov, thanks).



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5392 ea778897-0a13-0410-b9d1-a72fbfd435f5
 2010-11-10 17:47:55 +00:00
Nick Treleaven
832d22d23f Re-add data attribute (oops). 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5340 ea778897-0a13-0410-b9d1-a72fbfd435f5
 2010-10-28 16:19:26 +00:00
Nick Treleaven
879ef25b09 Match data-* and aria-* as HTML attributes. 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5338 ea778897-0a13-0410-b9d1-a72fbfd435f5
 2010-10-28 12:06:53 +00:00
Nick Treleaven
076452006c Add HTML5 attributes (thanks to Ross McKay). 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5324 ea778897-0a13-0410-b9d1-a72fbfd435f5
 2010-10-25 17:29:52 +00:00
Nick Treleaven
975376db78 Add HTML5 element names (thanks to Ross McKay). 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5319 ea778897-0a13-0410-b9d1-a72fbfd435f5
 2010-10-22 16:51:32 +00:00
Nick Treleaven
e28f5bc3ab Move filetype 'extension' default into data files. 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5309 ea778897-0a13-0410-b9d1-a72fbfd435f5
 2010-10-20 16:15:39 +00:00
Nick Treleaven
f92a31b59c Replace filetypes.xml html_asp_default_language key with 
filetypes.html asp.default.language property in [lexer_properties]
group.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4433 ea778897-0a13-0410-b9d1-a72fbfd435f5
 2009-11-18 17:07:12 +00:00
Nick Treleaven
c0dcc7002b Change new html_asp_default_language markup pref to use integer, 
not hex in config file.
Fix minor issue with changing pref back to 0.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4246 ea778897-0a13-0410-b9d1-a72fbfd435f5
 2009-09-27 16:16:18 +00:00
Enrico Tröger
2b7cba9637 Update VBScrpt keywords (patch by Ross McKay, thanks). 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4236 ea778897-0a13-0410-b9d1-a72fbfd435f5
 2009-09-24 17:15:43 +00:00
Enrico Tröger
edd50b5f6c Add "html_asp_default_language" pseudo style to filetypes.xml to allow setting the used language in embedded ASP code (patch by Ross McKay, thanks). 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4235 ea778897-0a13-0410-b9d1-a72fbfd435f5
 2009-09-24 17:12:36 +00:00
Enrico Tröger
0c97d49ed2 Add style 'jscript_regex' for filetype HTML (patch by Chris Macksey, thanks). 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3872 ea778897-0a13-0410-b9d1-a72fbfd435f5
 2009-06-17 19:04:17 +00:00
Enrico Tröger
d860305049 Add missing HTML attribute 'xml:lang'. 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@2932 ea778897-0a13-0410-b9d1-a72fbfd435f5
 2008-09-10 11:28:33 +00:00
Enrico Tröger
7cd303af3f Add four new PHP 5.3 keywords (patch by Felipe Pena, thanks). 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@2846 ea778897-0a13-0410-b9d1-a72fbfd435f5
 2008-08-01 15:52:42 +00:00
Enrico Tröger
abfbc59c3f Use Javascript styles for any VBScript and ASP code embedded in a HTML file. 
Use Python styles for embedded Python code.

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@2570 ea778897-0a13-0410-b9d1-a72fbfd435f5
 2008-05-12 12:20:49 +00:00
Enrico Tröger
cec6e18c61 Unify the embedded JavaScript styles with the styles of the JavaScript filetype for a more consistent styling of JavaScript in general. 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@2525 ea778897-0a13-0410-b9d1-a72fbfd435f5
 2008-04-24 14:17:11 +00:00
Enrico Tröger
86c710e612 Update PHP keywords (closes #1939931). 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@2473 ea778897-0a13-0410-b9d1-a72fbfd435f5
 2008-04-11 15:59:44 +00:00
Nick Treleaven
79ff87713a Add configurable default file extension setting for filetype 
definition files.
Note: There is a bug with using the default extension, not the user
set one, if 'New with template' is used before any documents of the
same filetype are open.


git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@2006 ea778897-0a13-0410-b9d1-a72fbfd435f5
 2007-11-01 16:33:06 +00:00
Enrico Tröger
398ddf6d73 Added context actions to run custom commands on current selection or the current word below cursor. 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@1453 ea778897-0a13-0410-b9d1-a72fbfd435f5
 2007-04-15 18:09:59 +00:00
Nick Treleaven
3888323376 Fix indentation spelling ;-) 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@1375 ea778897-0a13-0410-b9d1-a72fbfd435f5
 2007-03-09 12:26:55 +00:00
Nick Treleaven
fa9decdaf9 Add underscore to default wordchars again (oops). 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@1023 ea778897-0a13-0410-b9d1-a72fbfd435f5
 2006-11-23 15:48:02 +00:00
Nick Treleaven
4cbe4f4170 Only use [a-zA-Z0-9] chars for default wordchars, to avoid problems 
with word matching when using Find & Replace functions.


git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@1020 ea778897-0a13-0410-b9d1-a72fbfd435f5
 2006-11-23 11:42:10 +00:00
Enrico Tröger
6330277845 Changed commentdoc(used for javadoc and Doxygen, /** */) colour to a light blue. 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@982 ea778897-0a13-0410-b9d1-a72fbfd435f5
 2006-11-09 19:02:18 +00:00
Enrico Tröger
31c17438cb Removed unused colour parsing functions. 
Let the colour chooser pick the colour under the cursor.
Fixed bug in parsing strings containing hex values, modified the styles to keep the syntax highlighting consistent.
Removed startup warning.


git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@641 ea778897-0a13-0410-b9d1-a72fbfd435f5
 2006-07-27 20:57:13 +00:00
Enrico Tröger
4d5efb8e72 added commentation and building settings 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@270 ea778897-0a13-0410-b9d1-a72fbfd435f5
 2006-04-27 16:31:40 +00:00