Update efault values.

Add missing attribute (lineBeginContext) in Syntax::context.
pasnox · Aug 17, 2012 · 77acbba · 77acbba
1 parent e333702
commit 77acbba
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/src/syntax/SyntaxContext.cpp b/src/syntax/SyntaxContext.cpp
@@ -5,6 +5,7 @@ class Syntax::ContextData : public QSharedData
 public:
     QString name;
     QString attribute;
+    QString lineBeginContext;
     QString lineEndContext;
     bool fallThrough;
     QString fallThroughContext;
@@ -15,7 +16,11 @@ class Syntax::ContextData : public QSharedData
 
     ContextData()
         : QSharedData(),
+            attribute( "normal" ),
+            lineBeginContext( "#stay" ),
+            lineEndContext( "#stay" ),
             fallThrough( false ),
+            fallThroughContext( "#stay" ),
             dynamic( false ),
             noIndentationBasedFolding( false ),
             caseSensitive( false )
@@ -26,6 +31,7 @@ class Syntax::ContextData : public QSharedData
         : QSharedData( other ),
             SYNTAX_OTHER_INIT( name ),
             SYNTAX_OTHER_INIT( attribute ),
+            SYNTAX_OTHER_INIT( lineBeginContext ),
             SYNTAX_OTHER_INIT( lineEndContext ),
             SYNTAX_OTHER_INIT( fallThrough ),
             SYNTAX_OTHER_INIT( fallThroughContext ),
@@ -56,6 +62,7 @@ Syntax::Context::~Context()
 
 SYNTAX_IMPL_MEMBER( QString, name, Context )
 SYNTAX_IMPL_MEMBER( QString, attribute, Context )
+SYNTAX_IMPL_MEMBER( QString, lineBeginContext, Context )
 SYNTAX_IMPL_MEMBER( QString, lineEndContext, Context )
 SYNTAX_IMPL_MEMBER( bool, fallThrough, Context )
 SYNTAX_IMPL_MEMBER( QString, fallThroughContext, Context )

diff --git a/src/syntax/SyntaxContext.h b/src/syntax/SyntaxContext.h
@@ -22,6 +22,7 @@ class Context
 
     SYNTAX_DECL_MEMBER( QString, name ); ///< Name of the context
     SYNTAX_DECL_MEMBER( QString, attribute );
+    SYNTAX_DECL_MEMBER( QString, lineBeginContext );
     SYNTAX_DECL_MEMBER( QString, lineEndContext );
     SYNTAX_DECL_MEMBER( bool, fallThrough );
     SYNTAX_DECL_MEMBER( QString, fallThroughContext );

diff --git a/src/syntax/SyntaxDocument.cpp b/src/syntax/SyntaxDocument.cpp
@@ -72,7 +72,7 @@ class Syntax::DocumentData : public QSharedData
     }
 };
 
-QString Syntax::DocumentData::globalDefaultDeliminator( " \t.():!+,-<=>%&*/;?[]^{|}~\\" );
+QString Syntax::DocumentData::globalDefaultDeliminator( ".():!+,-<=>%&*/;?[]^{|}~\\ \t" );
 
 
 Syntax::Document::Document()

diff --git a/src/syntax/SyntaxParser.cpp b/src/syntax/SyntaxParser.cpp
@@ -282,6 +282,9 @@ bool Syntax::Parser::startElement( const QString& namespaceURI, const QString& l
                 d->contextName = atts.value( i );
                 context.name() = d->contextName;
             }
+            else if ( QodeEdit::stringEquals( name, "lineBeginContext" ) ) {
+                context.lineBeginContext() = atts.value( i );
+            }
             else if ( QodeEdit::stringEquals( name, "lineEndContext" ) ) {
                 context.lineEndContext() = atts.value( i );
             }
@@ -309,6 +312,10 @@ bool Syntax::Parser::startElement( const QString& namespaceURI, const QString& l
             }
         }
 
+        if ( !context.fallThrough() ) {
+            context.fallThroughContext().clear();
+        }
+
         d->document->highlighting().contexts()[ context.name() ] = context;
 
         if ( d->document->highlighting().defaultContext().isEmpty() ) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -72,7 +72,7 @@ class Syntax::DocumentData : public QSharedData @@
         }
     };
-    QString Syntax::DocumentData::globalDefaultDeliminator( " \t.():!+,-<=>%&*/;?[]^{|}~\\" );
+    QString Syntax::DocumentData::globalDefaultDeliminator( ".():!+,-<=>%&*/;?[]^{|}~\\ \t" );
     Syntax::Document::Document()
@@ Expand Down @@