[prev in list] [next in list] [prev in thread] [next in thread]
List: kwrite-devel
Subject: [kate] part/syntax/data: Remove "AlignedCommentends" feature from isocpp.xml.
From: Milian Wolff <mail () milianw ! de>
Date: 2014-04-29 9:29:24
Message-ID: E1Wf4Ls-0001Bo-Ik () scm ! kde ! org
[Download RAW message or body]
Git commit 0409c234da417dff810453b646a8d4daebdb555e by Milian Wolff.
Committed on 29/04/2014 at 09:26.
Pushed by mwolff into branch 'master'.
Remove "AlignedCommentends" feature from isocpp.xml.
This feature is broken and very confusing to people. We had a
discussion on this and most people want to have ti removed. Just
now again a user was complaining about it:
> Could somebody tell me how blue "//" comment symbols are
> different from their gray counterparts?
Since this feature depends on the indent-depth and also requires
indentation with spaces, it should not be shipped with the default
syntax highlight, which must cope with all kinds of indentation
configurations.
CCMAIL: kwrite-devel@kde.org
M +4 -24 part/syntax/data/isocpp.xml
http://commits.kde.org/kate/0409c234da417dff810453b646a8d4daebdb555e
diff --git a/part/syntax/data/isocpp.xml b/part/syntax/data/isocpp.xml
index 2578c03..8c423e5 100644
--- a/part/syntax/data/isocpp.xml
+++ b/part/syntax/data/isocpp.xml
@@ -230,7 +230,7 @@
<DetectIdentifier />
<!-- Match comments -->
<IncludeRules context="##Doxygen" />
- <IncludeRules context="AlignedComments" />
+ <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/" \
/>
<Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" \
beginRegion="Comment" /> <!-- Match scope regions -->
<DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1" \
/> @@ -368,7 +368,7 @@
<RangeDetect attribute="Prep. Lib" context="#stay" char="<" char1=">" \
/> <IncludeRules context="##Doxygen" />
<Detect2Chars attribute="Comment" context="Commentar/Preprocessor" char="/" \
char1="*" beginRegion="Comment2" />
- <IncludeRules context="AlignedComments" />
+ <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/" \
/> </context>
<context name="Define" attribute="Preprocessor" lineEndContext="#pop">
@@ -390,7 +390,7 @@
<IncludeRules context="##Modelines" />
<DetectIdentifier />
<IncludeRules context="##Doxygen" />
- <IncludeRules context="AlignedComments" />
+ <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/" \
/>
<!-- Do not try to detect "C" style comments inside outscoped text
to prevent incorrect highlighting in case of overlapped (or not closed \
properly) comment block...
@@ -425,31 +425,11 @@
<IncludeRules context="##Modelines" />
<DetectIdentifier />
<IncludeRules context="##Doxygen" />
- <IncludeRules context="AlignedComments" />
+ <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/" \
/>
<Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" \
beginRegion="Comment" />
<RegExpr attribute="Comment" context="Outscoped intern" \
String="(#|%\:|\?\?=)\s*if" beginRegion="PP" firstNonSpace="true" insensitive="false" \
/>
<RegExpr attribute="Comment" context="#pop" String="(#|%\:|\?\?=)\s*endif" \
endRegion="PP" firstNonSpace="true" insensitive="false" /> </context>
-
- <context name="AlignedComments" lineEndContext="#stay" attribute="Comment">
- <Detect2Chars attribute="Region Marker" context="Commentar 1" column="0" \
char="/" char1="/" />
- <Detect2Chars attribute="Region Marker" context="Commentar 1" column="4" \
char="/" char1="/" />
- <Detect2Chars attribute="Region Marker" context="Commentar 1" column="8" \
char="/" char1="/" />
- <Detect2Chars attribute="Region Marker" context="Commentar 1" column="12" \
char="/" char1="/" />
- <Detect2Chars attribute="Region Marker" context="Commentar 1" column="16" \
char="/" char1="/" />
- <Detect2Chars attribute="Region Marker" context="Commentar 1" column="20" \
char="/" char1="/" />
- <Detect2Chars attribute="Region Marker" context="Commentar 1" column="24" \
char="/" char1="/" />
- <Detect2Chars attribute="Region Marker" context="Commentar 1" column="28" \
char="/" char1="/" />
- <Detect2Chars attribute="Region Marker" context="Commentar 1" column="32" \
char="/" char1="/" />
- <Detect2Chars attribute="Region Marker" context="Commentar 1" column="36" \
char="/" char1="/" />
- <Detect2Chars attribute="Region Marker" context="Commentar 1" column="40" \
char="/" char1="/" />
- <Detect2Chars attribute="Region Marker" context="Commentar 1" column="44" \
char="/" char1="/" />
- <Detect2Chars attribute="Region Marker" context="Commentar 1" column="48" \
char="/" char1="/" />
- <Detect2Chars attribute="Region Marker" context="Commentar 1" column="52" \
char="/" char1="/" />
- <Detect2Chars attribute="Region Marker" context="Commentar 1" column="56" \
char="/" char1="/" />
- <Detect2Chars attribute="Region Marker" context="Commentar 1" column="60" \
char="/" char1="/" />
- <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/" \
/>
- </context>
</contexts>
<itemDatas>
_______________________________________________
KWrite-Devel mailing list
KWrite-Devel@kde.org
https://mail.kde.org/mailman/listinfo/kwrite-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic