Differential D22095

Fix CMake COMMAND nested paren highlighting
ClosedPublic
Actions

Authored by smokris on Jun 25 2019, 6:32 PM.

Details

Reviewers

cullmann

Group Reviewers

Framework: Syntax Highlighting

Commits

R216:2abb1fd6e151: Fix CMake COMMAND nested paren highlighting

Summary

The CMake syntax highlighter was getting confused by balanced
parentheses in several functions' COMMAND arguments.
This patch turns on the 'nested-parentheses' flag for those
commands, enabling parentheses to be parsed correctly.

Test Plan

Added tests in autotests/input/highlight.cmake and updated the corresponding reference output files.

Diff Detail

Repository

R216 Syntax Highlighting

Lint

Lint Skipped

Unit

Unit Tests Skipped

smokris created this revision.Jun 25 2019, 6:32 PM

Restricted Application added projects: Kate, Frameworks. · View Herald TranscriptJun 25 2019, 6:32 PM

Restricted Application added subscribers: kde-frameworks-devel, kwrite-devel. · View Herald Transcript

smokris requested review of this revision.Jun 25 2019, 6:32 PM

smokris added a reviewer: Framework: Syntax Highlighting.Jun 25 2019, 6:35 PM

Looks reasonable to me. Thanks!

This revision is now accepted and ready to land.Jun 25 2019, 7:48 PM

Ah, I missed: the version should be updated.

Updated cmake.xml + cmake.xml.tpl version number.

I would say all commands w/ COMMAND named parameter need that. Also, add_custrom_target and execute_process...

Ah, yes. Here's a revised patch that also applies that change (and adds tests) for add_custom_target, execute_process, and add_test.

Then we merge this ;=)

Closed by commit R216:2abb1fd6e151: Fix CMake COMMAND nested paren highlighting (authored by cullmann). · Explain WhyJul 3 2019, 6:19 PM

This revision was automatically updated to reflect the committed changes.

nibags mentioned this in D22568: Fix generator and test paths of CMake.Jul 19 2019, 7:41 PM

nibags mentioned this in R216:0b7e23a81a94: Fix generator and test paths of CMake.Jul 20 2019, 8:14 PM

Revision Contents
Changeset List

			Path	Packages
M			generators/cmake.xml.tpl (2 lines)
M			generators/cmake.yaml (4 lines)
M			html/highlight.cmake.html (22 lines)
M			input/highlight.cmake (22 lines)
M			reference/highlight.cmake.ref (22 lines)
M			syntax/cmake.xml (27 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	60662			Jun 25 2019, 6:30 PM	★	★
Diff 2	60669			Jun 25 2019, 7:53 PM	★	★
Diff 3	60819			Jun 29 2019, 2:54 AM	★	★
Diff 4	61098	8b7cac7	R216:2abb1fd6e15175447e7e6b55201ba18e0a434cba	Jul 3 2019, 6:17 PM	★	★