Revision: 2712 http://geany.svn.sourceforge.net/geany/?rev=2712&view=rev Author: eht16 Date: 2008-06-19 09:19:26 -0700 (Thu, 19 Jun 2008)
Log Message: ----------- Allow symbol auto completion in embedded JavaScript in HTML files (closes #1997409).
Modified Paths: -------------- trunk/ChangeLog trunk/src/editor.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-06-19 16:13:19 UTC (rev 2711) +++ trunk/ChangeLog 2008-06-19 16:19:26 UTC (rev 2712) @@ -14,6 +14,9 @@ * src/editor.c: Improve scrolling on wrapped lines to avoid having search results on wrapped lines but outside of visible lines. + * src/editor.c: + Allow symbol auto completion in embedded JavaScript in HTML files + (closes #1997409).
2008-06-18 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2008-06-19 16:13:19 UTC (rev 2711) +++ trunk/src/editor.c 2008-06-19 16:19:26 UTC (rev 2712) @@ -1231,9 +1231,9 @@ root = linebuf + startword; rootlen = current - startword;
- /* entity autocompletion always in a HTML file, in a PHP file only - * when we are outside of <? ?> */ - if (ft->id == GEANY_FILETYPES_HTML || + /* entity autocompletion always in a HTML file except when inside embedded JavaScript, + * in a PHP file only when we are outside of <? ?> */ + if ((ft->id == GEANY_FILETYPES_HTML && (style < SCE_HJ_START || style > SCE_HJ_REGEX)) || (ft->id == GEANY_FILETYPES_PHP && (style < SCE_HPHP_DEFAULT || style > SCE_HPHP_OPERATOR) && line != (sci_get_line_count(sci) - 1))) /* this check is a workaround for a Scintilla bug: * the last line in a PHP gets wrong styling */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.