diff --git a/data/schema/language.xsd b/data/schema/language.xsd --- a/data/schema/language.xsd +++ b/data/schema/language.xsd @@ -311,16 +311,16 @@ lineEndContext: Next context if end of line is encountered lineEmptyContext: Next context if an empty line is encountered [optional] fallthrough: Use a fallthrough context [optional] + deprecated since 5.62 but preserved to maintain compatibility in older versions of KF5 fallthroughContext: Fall through to this context [optional] dynamic: Dynamic context [boolean, optional] noIndentationBasedFolding: Python uses indentation based folding. However, Python has parts where it does not use indentation based folding (e.g. for """ strings). In this case switch to an own context and set this attribute to true. Then the indentation based folding will ignore this parts and not change folding markers. [optional] TODO: - Explain fallthrough. - - Do we need fallthrough at all? It could be true, if fallthroughContext is set, false otherwise. - Make lineEndContext optional, defaults to '#stay'. Reasonable? --> @@ -350,7 +350,15 @@ - + + + + + + + + + diff --git a/data/syntax/4dos.xml b/data/syntax/4dos.xml --- a/data/syntax/4dos.xml +++ b/data/syntax/4dos.xml @@ -559,59 +559,59 @@ - + - + - + @@ -697,50 +697,50 @@ + fallthroughContext="#pop!inputMessage"> + fallthroughContext="#pop!inputMessage"> diff --git a/data/syntax/actionscript.xml b/data/syntax/actionscript.xml --- a/data/syntax/actionscript.xml +++ b/data/syntax/actionscript.xml @@ -272,10 +272,10 @@ - + - + @@ -290,7 +290,7 @@ - + diff --git a/data/syntax/ahk.xml b/data/syntax/ahk.xml --- a/data/syntax/ahk.xml +++ b/data/syntax/ahk.xml @@ -1019,11 +1019,11 @@ - + - + diff --git a/data/syntax/ample.xml b/data/syntax/ample.xml --- a/data/syntax/ample.xml +++ b/data/syntax/ample.xml @@ -3121,7 +3121,7 @@ - + @@ -3133,7 +3133,7 @@ - + diff --git a/data/syntax/ansic89.xml b/data/syntax/ansic89.xml --- a/data/syntax/ansic89.xml +++ b/data/syntax/ansic89.xml @@ -63,10 +63,10 @@ - + - + diff --git a/data/syntax/ansys.xml b/data/syntax/ansys.xml --- a/data/syntax/ansys.xml +++ b/data/syntax/ansys.xml @@ -2004,7 +2004,7 @@ - + diff --git a/data/syntax/apparmor.xml b/data/syntax/apparmor.xml --- a/data/syntax/apparmor.xml +++ b/data/syntax/apparmor.xml @@ -882,7 +882,7 @@ - + @@ -951,28 +951,28 @@ - + - + - + - + - + @@ -989,35 +989,35 @@ character after a space is highlighted as "Error". Check this when the bug has been fixed. --> - + - + - + - + @@ -1205,7 +1205,7 @@ - + @@ -1219,46 +1219,46 @@ - + - + @@ -1437,7 +1437,7 @@ - + @@ -1462,7 +1462,7 @@ - + diff --git a/data/syntax/asciidoc.xml b/data/syntax/asciidoc.xml --- a/data/syntax/asciidoc.xml +++ b/data/syntax/asciidoc.xml @@ -94,7 +94,7 @@ - + diff --git a/data/syntax/awk.xml b/data/syntax/awk.xml --- a/data/syntax/awk.xml +++ b/data/syntax/awk.xml @@ -172,88 +172,88 @@ + fallthroughContext="#pop"> + fallthroughContext="#pop"> + fallthroughContext="InChar"> diff --git a/data/syntax/bash.xml b/data/syntax/bash.xml --- a/data/syntax/bash.xml +++ b/data/syntax/bash.xml @@ -728,47 +728,47 @@ - + - + - + - + diff --git a/data/syntax/bibtex.xml b/data/syntax/bibtex.xml --- a/data/syntax/bibtex.xml +++ b/data/syntax/bibtex.xml @@ -44,22 +44,22 @@ - + - + diff --git a/data/syntax/brightscript.xml b/data/syntax/brightscript.xml --- a/data/syntax/brightscript.xml +++ b/data/syntax/brightscript.xml @@ -232,220 +232,220 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -620,141 +620,141 @@ - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/data/syntax/c.xml b/data/syntax/c.xml --- a/data/syntax/c.xml +++ b/data/syntax/c.xml @@ -220,33 +220,33 @@ - + - + - + - + - + - + diff --git a/data/syntax/ccss.xml b/data/syntax/ccss.xml --- a/data/syntax/ccss.xml +++ b/data/syntax/ccss.xml @@ -563,21 +563,21 @@ - + diff --git a/data/syntax/cg.xml b/data/syntax/cg.xml --- a/data/syntax/cg.xml +++ b/data/syntax/cg.xml @@ -235,7 +235,7 @@ - + diff --git a/data/syntax/cgis.xml b/data/syntax/cgis.xml --- a/data/syntax/cgis.xml +++ b/data/syntax/cgis.xml @@ -91,16 +91,16 @@ - + diff --git a/data/syntax/chicken.xml b/data/syntax/chicken.xml --- a/data/syntax/chicken.xml +++ b/data/syntax/chicken.xml @@ -362,7 +362,7 @@ - + diff --git a/data/syntax/clojure.xml b/data/syntax/clojure.xml --- a/data/syntax/clojure.xml +++ b/data/syntax/clojure.xml @@ -740,10 +740,10 @@ - + - + @@ -765,7 +765,7 @@ - + diff --git a/data/syntax/coffee.xml b/data/syntax/coffee.xml --- a/data/syntax/coffee.xml +++ b/data/syntax/coffee.xml @@ -191,7 +191,7 @@ - + diff --git a/data/syntax/crk.xml b/data/syntax/crk.xml --- a/data/syntax/crk.xml +++ b/data/syntax/crk.xml @@ -65,11 +65,11 @@ - + - + @@ -126,10 +126,10 @@ - + diff --git a/data/syntax/cs.xml b/data/syntax/cs.xml --- a/data/syntax/cs.xml +++ b/data/syntax/cs.xml @@ -116,10 +116,10 @@ - + - + @@ -134,7 +134,7 @@ - + diff --git a/data/syntax/css.xml b/data/syntax/css.xml --- a/data/syntax/css.xml +++ b/data/syntax/css.xml @@ -1388,36 +1388,36 @@ - + - + @@ -1558,33 +1558,33 @@ - + - + @@ -1630,23 +1630,23 @@ - + @@ -1659,43 +1659,43 @@ - + diff --git a/data/syntax/d.xml b/data/syntax/d.xml --- a/data/syntax/d.xml +++ b/data/syntax/d.xml @@ -470,10 +470,10 @@ - + - + @@ -511,17 +511,17 @@ - + - + @@ -578,7 +578,7 @@ - + @@ -640,7 +640,7 @@ - + @@ -653,7 +653,7 @@ - + diff --git a/data/syntax/djangotemplate.xml b/data/syntax/djangotemplate.xml --- a/data/syntax/djangotemplate.xml +++ b/data/syntax/djangotemplate.xml @@ -274,31 +274,31 @@ - + - + diff --git a/data/syntax/ferite.xml b/data/syntax/ferite.xml --- a/data/syntax/ferite.xml +++ b/data/syntax/ferite.xml @@ -49,10 +49,10 @@ - + - + diff --git a/data/syntax/fgl-4gl.xml b/data/syntax/fgl-4gl.xml --- a/data/syntax/fgl-4gl.xml +++ b/data/syntax/fgl-4gl.xml @@ -283,10 +283,10 @@ - + - + diff --git a/data/syntax/fgl-per.xml b/data/syntax/fgl-per.xml --- a/data/syntax/fgl-per.xml +++ b/data/syntax/fgl-per.xml @@ -95,10 +95,10 @@ - + - + diff --git a/data/syntax/fish.xml b/data/syntax/fish.xml --- a/data/syntax/fish.xml +++ b/data/syntax/fish.xml @@ -455,36 +455,36 @@ - + @@ -501,10 +501,10 @@ - + @@ -803,13 +803,13 @@ - + @@ -852,27 +852,27 @@ - + - + @@ -911,18 +911,18 @@ - + - + diff --git a/data/syntax/fortran-fixed.xml b/data/syntax/fortran-fixed.xml --- a/data/syntax/fortran-fixed.xml +++ b/data/syntax/fortran-fixed.xml @@ -538,27 +538,27 @@ - + - + - + diff --git a/data/syntax/fortran-free.xml b/data/syntax/fortran-free.xml --- a/data/syntax/fortran-free.xml +++ b/data/syntax/fortran-free.xml @@ -265,26 +265,26 @@ - + - + - + diff --git a/data/syntax/fsharp.xml b/data/syntax/fsharp.xml --- a/data/syntax/fsharp.xml +++ b/data/syntax/fsharp.xml @@ -225,18 +225,18 @@ - + diff --git a/data/syntax/glsl.xml b/data/syntax/glsl.xml --- a/data/syntax/glsl.xml +++ b/data/syntax/glsl.xml @@ -1176,7 +1176,7 @@ - + diff --git a/data/syntax/grammar.xml b/data/syntax/grammar.xml --- a/data/syntax/grammar.xml +++ b/data/syntax/grammar.xml @@ -72,7 +72,7 @@ - + diff --git a/data/syntax/groovy.xml b/data/syntax/groovy.xml --- a/data/syntax/groovy.xml +++ b/data/syntax/groovy.xml @@ -3794,10 +3794,10 @@ - + - + @@ -3826,7 +3826,7 @@ - + @@ -3842,7 +3842,7 @@ - + diff --git a/data/syntax/html.xml b/data/syntax/html.xml --- a/data/syntax/html.xml +++ b/data/syntax/html.xml @@ -187,36 +187,36 @@ - + - + - + - + diff --git a/data/syntax/hunspell-dat.xml b/data/syntax/hunspell-dat.xml --- a/data/syntax/hunspell-dat.xml +++ b/data/syntax/hunspell-dat.xml @@ -6,7 +6,7 @@ - + diff --git a/data/syntax/hunspell-idx.xml b/data/syntax/hunspell-idx.xml --- a/data/syntax/hunspell-idx.xml +++ b/data/syntax/hunspell-idx.xml @@ -6,7 +6,7 @@ - + diff --git a/data/syntax/ilerpg.xml b/data/syntax/ilerpg.xml --- a/data/syntax/ilerpg.xml +++ b/data/syntax/ilerpg.xml @@ -583,7 +583,7 @@ - + diff --git a/data/syntax/isocpp.xml b/data/syntax/isocpp.xml --- a/data/syntax/isocpp.xml +++ b/data/syntax/isocpp.xml @@ -341,29 +341,29 @@ - + - + @@ -395,38 +395,38 @@ - + - + - + - + - + - + @@ -543,90 +543,90 @@ - + - + - + - + @@ -645,7 +645,7 @@ - + @@ -666,28 +666,28 @@ - + - + - + - + - + @@ -421,23 +421,23 @@ - + diff --git a/data/syntax/java.xml b/data/syntax/java.xml --- a/data/syntax/java.xml +++ b/data/syntax/java.xml @@ -3800,7 +3800,7 @@ - + @@ -3816,7 +3816,7 @@ - + diff --git a/data/syntax/javascript-react.xml b/data/syntax/javascript-react.xml --- a/data/syntax/javascript-react.xml +++ b/data/syntax/javascript-react.xml @@ -56,18 +56,18 @@ - + @@ -101,14 +101,14 @@ - + - + @@ -170,30 +170,30 @@ - + - + - + - + @@ -210,14 +210,14 @@ - + - + diff --git a/data/syntax/javascript.xml b/data/syntax/javascript.xml --- a/data/syntax/javascript.xml +++ b/data/syntax/javascript.xml @@ -82,32 +82,32 @@ - + @@ -133,27 +133,27 @@ - + - + @@ -240,13 +240,13 @@ - + - + diff --git a/data/syntax/jsp.xml b/data/syntax/jsp.xml --- a/data/syntax/jsp.xml +++ b/data/syntax/jsp.xml @@ -2927,11 +2927,11 @@ - + - + diff --git a/data/syntax/kconfig.xml b/data/syntax/kconfig.xml --- a/data/syntax/kconfig.xml +++ b/data/syntax/kconfig.xml @@ -78,65 +78,65 @@ - + - + - + - + - + - + - + @@ -150,103 +150,103 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -262,159 +262,159 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -428,7 +428,7 @@ - + @@ -451,7 +451,7 @@ - + @@ -465,7 +465,7 @@ - + @@ -484,7 +484,7 @@ - + @@ -498,7 +498,7 @@ - + @@ -517,67 +517,67 @@ - + - + - + - + - + - + @@ -662,445 +662,445 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/data/syntax/kotlin.xml b/data/syntax/kotlin.xml --- a/data/syntax/kotlin.xml +++ b/data/syntax/kotlin.xml @@ -124,127 +124,127 @@ - + - + diff --git a/data/syntax/latex.xml b/data/syntax/latex.xml --- a/data/syntax/latex.xml +++ b/data/syntax/latex.xml @@ -309,7 +309,7 @@ - + @@ -344,7 +344,7 @@ - + @@ -358,44 +358,44 @@ - + - + @@ -448,13 +448,13 @@ - + @@ -480,11 +480,11 @@ - + @@ -552,31 +552,31 @@ - + - + - + - + @@ -587,10 +587,10 @@ - + - + @@ -601,10 +601,10 @@ - + - + @@ -620,7 +620,7 @@ - + @@ -631,11 +631,11 @@ - + @@ -712,40 +712,40 @@ - + - + @@ -797,7 +797,7 @@ - + @@ -815,60 +815,60 @@ - + - + - + @@ -922,28 +922,28 @@ - + diff --git a/data/syntax/ld.xml b/data/syntax/ld.xml --- a/data/syntax/ld.xml +++ b/data/syntax/ld.xml @@ -51,7 +51,7 @@ - + diff --git a/data/syntax/less.xml b/data/syntax/less.xml --- a/data/syntax/less.xml +++ b/data/syntax/less.xml @@ -1346,28 +1346,28 @@ - diff --git a/data/syntax/lex.xml b/data/syntax/lex.xml --- a/data/syntax/lex.xml +++ b/data/syntax/lex.xml @@ -34,7 +34,7 @@ - + @@ -87,12 +87,12 @@ - + - + diff --git a/data/syntax/lilypond.xml b/data/syntax/lilypond.xml --- a/data/syntax/lilypond.xml +++ b/data/syntax/lilypond.xml @@ -736,17 +736,17 @@ + fallthroughContext="#pop"> + fallthroughContext="#pop"> @@ -785,77 +785,77 @@ + fallthroughContext="#pop"> + fallthroughContext="#pop"> + fallthroughContext="#pop"> + fallthroughContext="#pop#pop"> + fallthroughContext="#pop"> + fallthroughContext="scheme2"> @@ -879,156 +879,156 @@ + fallthroughContext="#pop"> + fallthroughContext="#pop"> + fallthroughContext="#pop"> + fallthroughContext="#pop"> + fallthroughContext="#pop"> + fallthroughContext="#pop"> + fallthroughContext="#pop"> + fallthroughContext="#pop"> + fallthroughContext="#pop#pop"> @@ -1041,21 +1041,21 @@ + fallthroughContext="#pop"> @@ -1068,16 +1068,16 @@ + fallthroughContext="#pop"> @@ -1097,54 +1097,54 @@ + fallthroughContext="#pop"> + fallthroughContext="#pop#pop"> + fallthroughContext="#pop"> + fallthroughContext="#pop"> + fallthroughContext="#pop"> diff --git a/data/syntax/logcat.xml b/data/syntax/logcat.xml --- a/data/syntax/logcat.xml +++ b/data/syntax/logcat.xml @@ -88,7 +88,7 @@ - + @@ -157,7 +157,7 @@ - + - + - + - + diff --git a/data/syntax/mup.xml b/data/syntax/mup.xml --- a/data/syntax/mup.xml +++ b/data/syntax/mup.xml @@ -617,14 +617,14 @@ + fallthroughContext="#pop"> + fallthroughContext="#pop"> @@ -643,24 +643,24 @@ + fallthroughContext="#pop"> + fallthroughContext="#pop"> + fallthroughContext="#pop"> @@ -674,17 +674,17 @@ + fallthroughContext="#pop"> + fallthroughContext="#pop"> @@ -697,7 +697,7 @@ + fallthroughContext="#pop"> @@ -711,53 +711,53 @@ + fallthroughContext="#pop"> + fallthroughContext="#pop"> + fallthroughContext="#pop"> + fallthroughContext="#pop"> + fallthroughContext="#pop"> + fallthroughContext="#pop"> @@ -771,7 +771,7 @@ + fallthroughContext="#pop"> @@ -787,49 +787,49 @@ + fallthroughContext="#pop"> + fallthroughContext="#pop"> + fallthroughContext="#pop"> + fallthroughContext="#pop"> diff --git a/data/syntax/mustache.xml b/data/syntax/mustache.xml --- a/data/syntax/mustache.xml +++ b/data/syntax/mustache.xml @@ -151,26 +151,26 @@ - + - + @@ -239,7 +239,7 @@ - + @@ -255,16 +255,16 @@ - + diff --git a/data/syntax/nesc.xml b/data/syntax/nesc.xml --- a/data/syntax/nesc.xml +++ b/data/syntax/nesc.xml @@ -102,10 +102,10 @@ - + - + diff --git a/data/syntax/ninja.xml b/data/syntax/ninja.xml --- a/data/syntax/ninja.xml +++ b/data/syntax/ninja.xml @@ -54,209 +54,209 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/data/syntax/objectivec.xml b/data/syntax/objectivec.xml --- a/data/syntax/objectivec.xml +++ b/data/syntax/objectivec.xml @@ -69,10 +69,10 @@ - + - + diff --git a/data/syntax/objectivecpp.xml b/data/syntax/objectivecpp.xml --- a/data/syntax/objectivecpp.xml +++ b/data/syntax/objectivecpp.xml @@ -193,10 +193,10 @@ - + - + diff --git a/data/syntax/opencl.xml b/data/syntax/opencl.xml --- a/data/syntax/opencl.xml +++ b/data/syntax/opencl.xml @@ -146,11 +146,11 @@ - + - + diff --git a/data/syntax/perl.xml b/data/syntax/perl.xml --- a/data/syntax/perl.xml +++ b/data/syntax/perl.xml @@ -599,13 +599,13 @@ - + @@ -706,7 +706,7 @@ - + @@ -725,7 +725,7 @@ - + @@ -740,11 +740,11 @@ - + - + @@ -814,38 +814,38 @@ - + - + - + diff --git a/data/syntax/pig.xml b/data/syntax/pig.xml --- a/data/syntax/pig.xml +++ b/data/syntax/pig.xml @@ -136,10 +136,10 @@ - + diff --git a/data/syntax/pony.xml b/data/syntax/pony.xml --- a/data/syntax/pony.xml +++ b/data/syntax/pony.xml @@ -208,71 +208,71 @@ - + - + - + - + - + diff --git a/data/syntax/powershell.xml b/data/syntax/powershell.xml --- a/data/syntax/powershell.xml +++ b/data/syntax/powershell.xml @@ -899,7 +899,7 @@ - + diff --git a/data/syntax/prolog.xml b/data/syntax/prolog.xml --- a/data/syntax/prolog.xml +++ b/data/syntax/prolog.xml @@ -503,19 +503,19 @@ --> - + @@ -718,10 +718,10 @@ + fallthroughContext="#pop" > - - - + - + - + - + diff --git a/data/syntax/protobuf.xml b/data/syntax/protobuf.xml --- a/data/syntax/protobuf.xml +++ b/data/syntax/protobuf.xml @@ -62,50 +62,50 @@ - + - + diff --git a/data/syntax/puppet.xml b/data/syntax/puppet.xml --- a/data/syntax/puppet.xml +++ b/data/syntax/puppet.xml @@ -211,105 +211,105 @@ - + - + - + @@ -361,33 +361,33 @@ - + @@ -495,99 +495,99 @@ - + - + diff --git a/data/syntax/python.xml b/data/syntax/python.xml --- a/data/syntax/python.xml +++ b/data/syntax/python.xml @@ -366,113 +366,113 @@ - + - + - + diff --git a/data/syntax/rhtml.xml b/data/syntax/rhtml.xml --- a/data/syntax/rhtml.xml +++ b/data/syntax/rhtml.xml @@ -495,15 +495,15 @@ - + - + diff --git a/data/syntax/rtf.xml b/data/syntax/rtf.xml --- a/data/syntax/rtf.xml +++ b/data/syntax/rtf.xml @@ -12,7 +12,7 @@ - + @@ -28,11 +28,11 @@ - + diff --git a/data/syntax/ruby.xml b/data/syntax/ruby.xml --- a/data/syntax/ruby.xml +++ b/data/syntax/ruby.xml @@ -319,99 +319,99 @@ - + - + - + - + - + - + @@ -438,13 +438,13 @@ The contexts below support both normal and indented heredocs --> - + - + @@ -474,60 +474,60 @@ - + @@ -740,44 +740,44 @@ - + @@ -820,54 +820,54 @@ - + - + @@ -906,24 +906,24 @@ - + @@ -936,53 +936,53 @@ - + diff --git a/data/syntax/selinux-cil.xml b/data/syntax/selinux-cil.xml --- a/data/syntax/selinux-cil.xml +++ b/data/syntax/selinux-cil.xml @@ -370,7 +370,7 @@ + lineEndContext="#pop" fallthroughContext="#pop!_square_brackets_cil_path_content"> @@ -420,15 +420,15 @@ + lineEndContext="#pop!_av_permissions_statement" fallthroughContext="#pop!_av_permissions_statement"> @@ -476,12 +476,12 @@ - + - + @@ -496,11 +496,11 @@ - + - + @@ -514,11 +514,11 @@ - + - + @@ -532,11 +532,11 @@ - + - + @@ -550,11 +550,11 @@ - + - + @@ -568,11 +568,11 @@ - + - + @@ -596,90 +596,90 @@ - + - + - + - + - + - + diff --git a/data/syntax/selinux-fc.xml b/data/syntax/selinux-fc.xml --- a/data/syntax/selinux-fc.xml +++ b/data/syntax/selinux-fc.xml @@ -163,67 +163,67 @@ - + - + + lineEndContext="#pop" fallthroughContext="#pop!_fc_level_range"> - + - + - + - + - + - + - + @@ -237,64 +237,64 @@ + lineEndContext="#pop" fallthroughContext="#pop!_gen_context_type"> + lineEndContext="#pop!_fc_find_comma" fallthroughContext="#pop!_fc_find_comma"> - + + lineEndContext="#stay" fallthroughContext="#pop!_gen_context_level"> - + diff --git a/data/syntax/selinux.xml b/data/syntax/selinux.xml --- a/data/syntax/selinux.xml +++ b/data/syntax/selinux.xml @@ -974,11 +974,11 @@ - + @@ -1019,7 +1019,7 @@ - + @@ -1031,46 +1031,46 @@ - + - + - + - + - + - + + lineEndContext="#pop" fallthroughContext="#pop!_filename_quoted"> @@ -1095,7 +1095,7 @@ - + @@ -1109,11 +1109,11 @@ - + + lineEndContext="#pop" fallthroughContext="#pop!_function_gen_context_content"> @@ -1138,51 +1138,51 @@ - + - + - + - + - + - + @@ -1226,7 +1226,7 @@ - + @@ -1322,36 +1322,36 @@ - + + lineEndContext="#pop#pop" fallthroughContext="#pop#pop"> - + @@ -1471,7 +1471,7 @@ + lineEndContext="#pop" fallthroughContext="#pop!_square_brackets_content"> @@ -1483,7 +1483,7 @@ + lineEndContext="#pop" fallthroughContext="#pop!_round_brackets_content"> @@ -1499,18 +1499,18 @@ + lineEndContext="#pop" fallthroughContext="#pop!_square_brackets_quoted_content"> + lineEndContext="#pop" fallthroughContext="#pop!_round_brackets_quoted_content"> @@ -1526,16 +1526,16 @@ + lineEndContext="#pop!_square_brackets_otherquote_content" fallthroughContext="#pop!_square_brackets_otherquote_content"> + lineEndContext="#pop!_round_brackets_otherquote_content" fallthroughContext="#pop!_round_brackets_otherquote_content"> diff --git a/data/syntax/sml.xml b/data/syntax/sml.xml --- a/data/syntax/sml.xml +++ b/data/syntax/sml.xml @@ -73,7 +73,7 @@ - + diff --git a/data/syntax/stan.xml b/data/syntax/stan.xml --- a/data/syntax/stan.xml +++ b/data/syntax/stan.xml @@ -77,16 +77,16 @@ - + - + - + diff --git a/data/syntax/taskjuggler.xml b/data/syntax/taskjuggler.xml --- a/data/syntax/taskjuggler.xml +++ b/data/syntax/taskjuggler.xml @@ -337,11 +337,11 @@ - + - + diff --git a/data/syntax/tcsh.xml b/data/syntax/tcsh.xml --- a/data/syntax/tcsh.xml +++ b/data/syntax/tcsh.xml @@ -622,45 +622,45 @@ - + - + - + - + @@ -741,20 +741,20 @@ - + - + diff --git a/data/syntax/toml.xml b/data/syntax/toml.xml --- a/data/syntax/toml.xml +++ b/data/syntax/toml.xml @@ -28,11 +28,11 @@ - + - + @@ -43,7 +43,7 @@ - + diff --git a/data/syntax/typescript-react.xml b/data/syntax/typescript-react.xml --- a/data/syntax/typescript-react.xml +++ b/data/syntax/typescript-react.xml @@ -58,18 +58,18 @@ - + @@ -108,10 +108,10 @@ - + @@ -127,10 +127,10 @@ - + @@ -189,7 +189,7 @@ - + @@ -200,7 +200,7 @@ - + @@ -260,46 +260,46 @@ - + - + - + - + - + - + - + - + @@ -316,14 +316,14 @@ - + - + diff --git a/data/syntax/typescript.xml b/data/syntax/typescript.xml --- a/data/syntax/typescript.xml +++ b/data/syntax/typescript.xml @@ -1649,71 +1649,71 @@ - + @@ -1760,13 +1760,13 @@ - + - + @@ -1830,22 +1830,22 @@ - + @@ -1891,27 +1891,27 @@ - + - + @@ -1924,25 +1924,25 @@ - + @@ -1956,97 +1956,97 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/data/syntax/uscript.xml b/data/syntax/uscript.xml --- a/data/syntax/uscript.xml +++ b/data/syntax/uscript.xml @@ -132,10 +132,10 @@ - + - + diff --git a/data/syntax/vala.xml b/data/syntax/vala.xml --- a/data/syntax/vala.xml +++ b/data/syntax/vala.xml @@ -153,11 +153,11 @@ - + - + diff --git a/data/syntax/xul.xml b/data/syntax/xul.xml --- a/data/syntax/xul.xml +++ b/data/syntax/xul.xml @@ -558,7 +558,7 @@ - + @@ -569,18 +569,18 @@ - + - + diff --git a/data/syntax/yacc.xml b/data/syntax/yacc.xml --- a/data/syntax/yacc.xml +++ b/data/syntax/yacc.xml @@ -112,20 +112,20 @@ - + @@ -145,13 +145,13 @@ - + @@ -231,16 +231,16 @@ - + - + diff --git a/data/syntax/yaml.xml b/data/syntax/yaml.xml --- a/data/syntax/yaml.xml +++ b/data/syntax/yaml.xml @@ -74,83 +74,83 @@ - + - + - + - + - + - + @@ -182,150 +182,150 @@ - + - + - + - + - + - + @@ -353,36 +353,36 @@ - + - + - + - + - + diff --git a/src/lib/context.cpp b/src/lib/context.cpp --- a/src/lib/context.cpp +++ b/src/lib/context.cpp @@ -61,12 +61,10 @@ m_attribute = reader.attributes().value(QStringLiteral("attribute")).toString(); m_lineEndContext.parse(reader.attributes().value(QStringLiteral("lineEndContext"))); m_lineEmptyContext.parse(reader.attributes().value(QStringLiteral("lineEmptyContext"))); - m_fallthrough = Xml::attrToBool(reader.attributes().value(QStringLiteral("fallthrough"))); m_fallthroughContext.parse(reader.attributes().value(QStringLiteral("fallthroughContext"))); - if (m_fallthroughContext.isStay()) - m_fallthrough = false; + m_fallthrough = !m_fallthroughContext.isStay(); m_noIndentationBasedFolding = Xml::attrToBool(reader.attributes().value(QStringLiteral("noIndentationBasedFolding"))); reader.readNext(); while (!reader.atEnd()) { switch (reader.tokenType()) {