SF.net SVN: geany: [827] trunk

[eht16 at users.sourceforge.net]

Revision: 827
          http://svn.sourceforge.net/geany/?rev=827&view=rev
Author:   eht16
Date:     2006-09-20 14:52:35 -0700 (Wed, 20 Sep 2006)

Log Message:
-----------
Don't start autocompletion in strings and comments.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/sci_cb.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-09-20 12:49:41 UTC (rev 826)
+++ trunk/ChangeLog	2006-09-20 21:52:35 UTC (rev 827)
@@ -1,3 +1,8 @@
+2006-09-20  Enrico Tröger  <enrico.troeger at uvena.de>
+
+ * src/sci_cb.c: Don't start autocompletion in strings and comments.
+
+
 2006-09-20  Nick Treleaven  <nick.treleaven at btinternet.com>
 
  * src/search.c, src/search.h:

Modified: trunk/src/sci_cb.c
===================================================================
--- trunk/src/sci_cb.c	2006-09-20 12:49:41 UTC (rev 826)
+++ trunk/src/sci_cb.c	2006-09-20 21:52:35 UTC (rev 827)
@@ -635,11 +635,37 @@
 	lexer = SSM(sci, SCI_GETLEXER, 0, 0);
 	style = SSM(sci, SCI_GETSTYLEAT, pos, 0);
 
-	//if (lexer != SCLEX_CPP && lexer != SCLEX_HTML && lexer != SCLEX_PASCAL) return FALSE;
+	// don't autocomplete in comments and strings
 	if (lexer == SCLEX_HTML && style == SCE_H_DEFAULT) return FALSE;
-	if (lexer == SCLEX_CPP && (style == SCE_C_COMMENT ||
-			style == SCE_C_COMMENTLINE || style == SCE_C_COMMENTDOC)) return FALSE;
+	else if ((lexer == SCLEX_CPP || lexer == SCLEX_PASCAL) && (style == SCE_C_COMMENT ||
+														  style == SCE_C_COMMENTLINE ||
+														  style == SCE_C_COMMENTDOC ||
+														  style == SCE_C_STRING)) return FALSE;
+	else if (lexer == SCLEX_PYTHON && (style == SCE_P_COMMENTLINE ||
+									   style == SCE_P_COMMENTBLOCK ||
+									   style == SCE_P_STRING)) return FALSE;
+	else if (lexer == SCLEX_F77 && (style == SCE_F_COMMENT ||
+									style == SCE_F_STRING1 ||
+									style == SCE_F_STRING2)) return FALSE;
+	else if (lexer == SCLEX_PERL && (style == SCE_PL_COMMENTLINE ||
+									 style == SCE_PL_STRING)) return FALSE;
+	else if (lexer == SCLEX_PROPERTIES && style == SCE_PROPS_COMMENT) return FALSE;
+	else if (lexer == SCLEX_LATEX && style == SCE_L_COMMENT) return FALSE;
+	else if (lexer == SCLEX_MAKEFILE && style == SCE_MAKE_COMMENT) return FALSE;
+	else if (lexer == SCLEX_RUBY && (style == SCE_RB_COMMENTLINE ||
+									 style == SCE_RB_STRING)) return FALSE;
+	else if (lexer == SCLEX_BASH && (style == SCE_SH_COMMENTLINE ||
+									 style == SCE_SH_STRING)) return FALSE;
+	else if (lexer == SCLEX_SQL && (style == SCE_SQL_COMMENT ||
+									style == SCE_SQL_COMMENTLINE ||
+									style == SCE_SQL_COMMENTDOC ||
+									style == SCE_SQL_STRING)) return FALSE;
+	else if (lexer == SCLEX_TCL && (style == SCE_TCL_COMMENT ||
+									style == SCE_TCL_COMMENTLINE ||
+									style == SCE_TCL_IN_QUOTE)) return FALSE;
+	else if (lexer == SCLEX_RUBY && style == SCE_MAKE_COMMENT) return FALSE;
 
+
 	linebuf = g_malloc(line_len + 1);
 	sci_get_line(sci, line, linebuf);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.