Differential D6128

Bug 360656 - CMake: OR/AND not highlighted after expr in ()
ClosedPublic
Actions

Authored by jpoelen on Jun 7 2017, 12:08 AM.

Details

Reviewers
kwrite-devel
dhaumann
Group Reviewers
Framework: Syntax Highlighting
KTextEditor
Kate
Commits
R216:714f17d79ab7: CMake: OR/AND not highlighted after expr in ()
Summary

Description copied from bugzilla:

If you type in if((A AND B) OR C), OR is not highlighted.

Test Plan
if((A AND B) OR C)

Diff Detail

Repository
R216 Syntax Highlighting
Branch
upstream
Lint
No Linters Available
Unit
No Unit Test Coverage
jpoelen created this revision.Jun 7 2017, 12:08 AM
Restricted Application added a project: Frameworks. · View Herald TranscriptJun 7 2017, 12:08 AM
Restricted Application added a subscriber: Frameworks. · View Herald Transcript
jpoelen retitled this revision from CMake: OR/AND not highlighted after expr in () If you type in "if((A AND B) OR C)", "OR" is not highlighted. to Bug 360656 - CMake: OR/AND not highlighted after expr in ().Jun 7 2017, 12:22 AM
jpoelen edited the summary of this revision. (Show Details)
jpoelen edited the test plan for this revision. (Show Details)
jpoelen updated this revision to Diff 15238.Jun 7 2017, 12:43 AM
jpoelen edited the summary of this revision. (Show Details)
  • Update test reference data
jpoelen updated this revision to Diff 15239.Jun 7 2017, 12:45 AM

Previous diff on bad branch

jpoelen updated this revision to Diff 15240.Jun 7 2017, 12:55 AM
  • cmake test: add an expression with nested parenthesis
dhaumann requested changes to this revision.Jun 12 2017, 2:35 AM
dhaumann added a subscriber: dhaumann.

Please increase the version attribute of the language element. Also, could you try fallthroughContext instead of using a Regexp that matches any char?

This revision now requires changes to proceed.Jun 12 2017, 2:35 AM
jpoelen updated this revision to Diff 15406.Jun 12 2017, 11:13 PM
jpoelen edited edge metadata.
  • cmake.xml: fallthroughContext instead of using a Regexp that matches any char and increase version
dhaumann accepted this revision.Jun 17 2017, 2:15 PM

This is a very good patch, thanks! Please keep up the good work :-)
I will integrate this now.

This revision is now accepted and ready to land.Jun 17 2017, 2:15 PM
Closed by commit R216:714f17d79ab7: CMake: OR/AND not highlighted after expr in () (authored by Jonathan Poelen <jonathan.poelen@gmail.com>, committed by dhaumann). · Explain WhyJun 17 2017, 2:27 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 15406

View Options

autotests/folding/highlight.cmake.fold

Loading...
View Options

autotests/html/highlight.cmake.html

Loading...
View Options

autotests/input/highlight.cmake

Loading...
View Options

autotests/reference/highlight.cmake.ref

Loading...
View Options

data/syntax/cmake.xml

Loading...