diff --git a/autotests/html/test.jsx.html b/autotests/html/test.jsx.html
index 4c1f541..6feb59a 100644
--- a/autotests/html/test.jsx.html
+++ b/autotests/html/test.jsx.html
@@ -1,103 +1,103 @@
test.jsx
-
+
// JavaScript React
/** @author Willy <willy@wmail.com>
* @url https://reactjs.org/ **/
import React from 'react';
import { PhotoStory, VideoStory } from './stories';
function Story(props) {
const SpecificStory = components[props.storyType];
return <SpecificStory story={ props.story } attr2="&ref;" attr3="Hello\n" />;
}
function
<Tag attr1={ <tag/> function <noTag/> return class var 0x123 { } &noRef; hello() React.Component() } attr2="&ref;">
/* no comment*/ function <tag/> return class var 0x123 &ref; hello() React.Component()
.<tag/> anyWord <tag/>
{ function <tag> return class var 0x123 hello() React.Component() }
</Tag>
<tag1> </tag1>
<tag1> </Tag$>
<Tag$> </tag>
<tag/*comment*/attr1/*comment*/= /*comment*/"value"/*comment*/attr2 /*comment*/attr3='a' key/*comment*/key2 />
// Detect Valid tags
/* comment */ <tag></tag>
{ /* comment
*/ <Tag />
word <noTag/> . <noTag/> } <noTag/>
return /* comment
multiline */ <tag/> /* comment */ <Tag/>
&& /*comment*/ <Tag/>
& /*comment*/ <noTag/>
<tag/>
{ <hello>Hello</hello> }
?<Tag />;
[ <tag /> ( <tag />
,<Tag/> =<Tag/>
&&<tag/> ||<tag/>
return <tag/> ;
default<tag/> ;
<Tag> <tag> <tag$/> </tag> return </Tag>
anyWord<noTag>
anyWord/*comment*/ <noTag/>
.<noTag>
&<notag> | <noTag/>
% /* comment*/ <noTag/>
<C<number>/>
<C<number>> </C>
<C
<error />
// Non-ASCII tag name & attribute
<日本語></日本語>;
<Component 本本:本-本 aa本:本 aa:aa />
<Namespace.DeepNamespace.Component />;
<Component { ... x } y
={2 } z />;
let k1 = <div> <h2> Hello </h2> <h1> world </h1></div>;
let k2 = <Button> <h2> Hello </h2> </Button>;
// Empty tags
<></>; // no whitespace
< ></ >; // lots of whitespace
< /*starting wrap*/ ></ /*ending wrap*/>; // comments in the tags
<>hi</>; // text inside
<><span>hi</span><div>bye</div></>; // children
<><span>1</span><><span>2.1</span><span>2.2</span></><span>3</span></>; // nested fragments
<>#</>; // # would cause scanning error if not in jsxtext
// Tags after substitutions in templates
`aaa${<tag></tag>//comment
/*comment*/<A/>}`
// Don't highlight tags within variable declaration
let myIdentity: <T>(arg: T) => T = identity;
var myIdentity: <U>(arg: U) => U = identity;
const myIdentity: {<T>(arg: T): T} = identity;
// Don't highlight tags within interfaces and classes
interface GenericIdentityFn {
<T>(arg: T): T;
<noTag />
}
class Handler {
info: <T>(arg: T): T <noTag />;
<tag> </tag>
}
diff --git a/autotests/html/test.tsx.html b/autotests/html/test.tsx.html
index 73ddd15..d375ec2 100644
--- a/autotests/html/test.tsx.html
+++ b/autotests/html/test.tsx.html
@@ -1,153 +1,153 @@
test.tsx
-
+
// TypeScript React
/** @author Willy <willy@wmail.com>
* @url https://reactjs.org/ **/
import React from 'react';
import { PhotoStory, VideoStory } from './stories';
function Story(props) {
const SpecificStory = components[props.storyType];
return <SpecificStory story={ props.story } attr2="&ref;" attr3="Hello\n" />;
}
function
<Tag attr1={ <tag/> function <noTag/> return class var 0x123 { } &noRef; hello() React.Component() } attr2="&ref;">
/* no comment*/ function <tag/> return class var 0x123 &ref; hello() React.Component()
.<tag/> anyWord <tag/>
{ function <tag> return class var 0x123 hello() React.Component() }
</Tag>
<tag1> </tag1>
<tag1> </Tag$>
<Tag$> </tag>
<tag/*comment*/attr1/*comment*/= /*comment*/"value"/*comment*/attr2 /*comment*/attr3='a' key/*comment*/key2 />
// Detect Valid tags
/* comment */ <tag></tag>
{ /* comment
*/ <Tag />
word <noTag/> . <noTag/> } <noTag/>
return /* comment
multiline */ <tag/> /* comment */ <Tag/>
&& /*comment*/ <Tag/>
& /*comment*/ <noTag/>
<tag/>
{ <hello>Hello</hello> }
?<Tag />;
[ <tag /> ( <tag />
,<Tag/> =<Tag/>
&&<tag/> ||<tag/>
return <tag/> ;
default<tag/> ;
<Tag> <tag> <tag$/> </tag> return </Tag>
anyWord<noTag>
anyWord/*comment*/ <noTag/>
.<noTag>
&<notag> | <noTag/>
% /* comment*/ <noTag/>
// TODO: Fix this (comment before the tag name):
var x = </**/div></div>;
// Tag after ":"
annotation: <tag/>
annotation: text [ <tag/> ]
console.log("hello")
// Type assertion in tag
<C<number>/>
<C<number>> </C>
<C
<error />
// Non-ASCII tag name & attribute
<日本語></日本語>;
<Component 本本:本-本 aa本:本 aa:aa />
<aaaa:ñ />
<Namespace.DeepNamespace.Component />;
<Component { ... x } y
={2 } z />;
let k1 =
<Comp a={10} b="hi" {...o} >
hi hi hi!
</Comp>;
let k2 =
<Comp a={10} b="hi">
<div> My Div </div>
{(name: string) => <div> My name {name} </div>}
</Comp>;
let k3 = <GenericComponent initialValues={{ x: "y" }} nextValues={a => ({ x: a.x })} />; // No Error
// OK
let k1 = <Comp a={10} b="hi"><></><Button /><AnotherButton /></Comp>;
let k2 = <Comp a={10} b="hi"><><Button /></><AnotherButton /></Comp>;
let k3 = <Comp a={10} b="hi"><><Button /><AnotherButton /></></Comp>;
let k4 = <SingleChildComp a={10} b="hi"><><Button /><AnotherButton /></></SingleChildComp>;
// OK
let k1 = <div> <h2> Hello </h2> <h1> world </h1></div>;
let k2 = <div> <h2> Hello </h2> {(user: any) => <h2>{user.name}</h2>}</div>;
let k3 = <div> {1} {"That is a number"} </div>;
let k4 = <Button> <h2> Hello </h2> </Button>;
// Empty tags
hello<>
hello<string>
<></>; // no whitespace
< ></ >; // lots of whitespace
< /*starting wrap*/ ></ /*ending wrap*/>; // comments in the tags
<>hi</>; // text inside
<><span>hi</span><div>bye</div></>; // children
<><span>1</span><><span>2.1</span><span>2.2</span></><span>3</span></>; // nested fragments
<>#</>; // # would cause scanning error if not in jsxtext
// Tags after substitutions in templates
`aaa${<tag></tag>//comment
/*comment*/<A/>}`
// Don't highlight tags within type declaration
type T12 = ReturnType<(<T>() => T)>;
type T13 = ReturnType<(<T extends U, U extends number[]>() => T)>;
type T14 = ReturnType<typeof f1>;
type T15 = ReturnType<(s: string) => void>;
// Don't highlight tags within variable declaration
let myIdentity: <T>(arg: T) => T <noTag/> = <Tag />;
var myIdentity: <U>(arg: U) => U = identity;
const myIdentity: {<T>(arg: T): T} = identity;
// Don't highlight tags within interfaces and classes
interface GenericIdentityFn {
<T>(arg: T): T;
<noTag />
}
class Handler {
info: <T>(arg: T): T <noTag />;
<tag> </tag>
}
// Highlight "<T extends" as a type assertion, not as a tag
// (the "cast" expression works and isn't supported in the TSX file)
const goodHighlighting = <T extends I>(
arg: T
) => {
const a = arg
return a
}
<tag> text <T extends I/> </tag> // Here "<T extends I/>" is a tag
diff --git a/autotests/syntaxrepository_test.cpp b/autotests/syntaxrepository_test.cpp
index ef7e918..1b775c9 100644
--- a/autotests/syntaxrepository_test.cpp
+++ b/autotests/syntaxrepository_test.cpp
@@ -1,562 +1,562 @@
/*
Copyright (C) 2016 Volker Krause
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "test-config.h"
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
namespace KSyntaxHighlighting
{
class NullHighlighter : public AbstractHighlighter
{
public:
using AbstractHighlighter::highlightLine;
void applyFormat(int offset, int length, const Format &format) Q_DECL_OVERRIDE
{
Q_UNUSED(offset);
Q_UNUSED(length);
// only here to ensure we don't crash
format.isDefaultTextStyle(theme());
format.textColor(theme());
}
};
class RepositoryTest : public QObject
{
Q_OBJECT
private:
Repository m_repo;
private Q_SLOTS:
void initTestCase()
{
QStandardPaths::setTestModeEnabled(true);
initRepositorySearchPaths(m_repo);
}
void testDefinitionByExtension_data()
{
QTest::addColumn("fileName");
QTest::addColumn("defName");
QTest::newRow("empty") << QString() << QString();
QTest::newRow("qml") << QStringLiteral("/bla/foo.qml") << QStringLiteral("QML");
QTest::newRow("glsl") << QStringLiteral("flat.frag") << QStringLiteral("GLSL");
// the following ones are defined in multiple syntax definitions
QTest::newRow("c") << QStringLiteral("test.c") << QStringLiteral("C");
QTest::newRow("c++") << QStringLiteral("test.cpp") << QStringLiteral("C++");
QTest::newRow("fs") << QStringLiteral("test.fs") << QStringLiteral("FSharp");
QTest::newRow("markdown") << QStringLiteral("test.md") << QStringLiteral("Markdown");
QTest::newRow("Makefile 1") << QStringLiteral("Makefile") << QStringLiteral("Makefile");
QTest::newRow("Makefile 2") << QStringLiteral("/some/path/to/Makefile") << QStringLiteral("Makefile");
QTest::newRow("Makefile 3") << QStringLiteral("Makefile.am") << QStringLiteral("Makefile");
}
void testDefinitionByExtension()
{
QFETCH(QString, fileName);
QFETCH(QString, defName);
auto def = m_repo.definitionForFileName(fileName);
if (defName.isEmpty()) {
QVERIFY(!def.isValid());
} else {
QVERIFY(def.isValid());
QCOMPARE(def.name(), defName);
}
}
void testDefinitionsForFileName_data()
{
QTest::addColumn("fileName");
QTest::addColumn("expectedNames");
QTest::newRow("Matlab") << QStringLiteral("/bla/foo.m") << (QStringList() << QStringLiteral("Magma") << QStringLiteral("Matlab") << QStringLiteral("Octave") << QStringLiteral("Objective-C"));
}
void testDefinitionsForFileName()
{
QFETCH(QString, fileName);
QFETCH(QStringList, expectedNames);
const auto defs = m_repo.definitionsForFileName(fileName);
QStringList names;
for (auto def : defs) {
names.push_back(def.name());
}
QCOMPARE(names, expectedNames);
}
void testDefinitionsForMimeType_data()
{
QTest::addColumn("mimeType");
QTest::addColumn("expectedNames");
QTest::newRow("C Header") << QStringLiteral("text/x-chdr")
<< (QStringList() << QStringLiteral("C++") << QStringLiteral("ISO C++") << QStringLiteral("C") << QStringLiteral("GCCExtensions") << QStringLiteral("ANSI C89") << QStringLiteral("SystemC"));
}
void testDefinitionsForMimeType()
{
QFETCH(QString, mimeType);
QFETCH(QStringList, expectedNames);
const auto defs = m_repo.definitionsForMimeType(mimeType);
QStringList names;
for (auto def : defs) {
names.push_back(def.name());
}
QCOMPARE(names, expectedNames);
}
void testLoadAll()
{
for (const auto &def : m_repo.definitions()) {
QVERIFY(!def.name().isEmpty());
QVERIFY(!def.translatedName().isEmpty());
QVERIFY(!def.isValid() || !def.section().isEmpty());
QVERIFY(!def.isValid() || !def.translatedSection().isEmpty());
// indirectly trigger loading, as we can't reach that from public API
// if the loading fails the highlighter will produce empty states
NullHighlighter hl;
State initialState;
hl.setDefinition(def);
const auto state = hl.highlightLine(QLatin1String("This should not crash } ] ) !"), initialState);
QVERIFY(!def.isValid() || state != initialState || def.name() == QLatin1String("Broken Syntax"));
}
}
void testMetaData()
{
auto def = m_repo.definitionForName(QLatin1String("Alerts"));
QVERIFY(def.isValid());
QVERIFY(def.extensions().isEmpty());
QVERIFY(def.mimeTypes().isEmpty());
QVERIFY(def.version() >= 1.11f);
QVERIFY(def.isHidden());
QCOMPARE(def.section(), QLatin1String("Other"));
QCOMPARE(def.license(), QLatin1String("MIT"));
QVERIFY(def.author().contains(QLatin1String("Dominik")));
QFileInfo fi(def.filePath());
QVERIFY(fi.isAbsolute());
QVERIFY(def.filePath().endsWith(QLatin1String("alert.xml")));
def = m_repo.definitionForName(QLatin1String("C++"));
QVERIFY(def.isValid());
QCOMPARE(def.section(), QLatin1String("Sources"));
QCOMPARE(def.indenter(), QLatin1String("cstyle"));
QCOMPARE(def.style(), QLatin1String("C++"));
QVERIFY(def.mimeTypes().contains(QLatin1String("text/x-c++hdr")));
QVERIFY(def.extensions().contains(QLatin1String("*.h")));
QCOMPARE(def.priority(), 9);
def = m_repo.definitionForName(QLatin1String("Apache Configuration"));
QVERIFY(def.isValid());
QVERIFY(def.extensions().contains(QLatin1String("httpd.conf")));
QVERIFY(def.extensions().contains(QLatin1String(".htaccess*")));
}
void testGeneralMetaData()
{
auto def = m_repo.definitionForName(QLatin1String("C++"));
QVERIFY(def.isValid());
QVERIFY(!def.indentationBasedFoldingEnabled());
// comment markers
QCOMPARE(def.singleLineCommentMarker(), QLatin1String("//"));
QCOMPARE(def.singleLineCommentPosition(), KSyntaxHighlighting::CommentPosition::StartOfLine);
const auto cppMultiLineCommentMarker = QPair(QLatin1String("/*"), QLatin1String("*/"));
QCOMPARE(def.multiLineCommentMarker(), cppMultiLineCommentMarker);
def = m_repo.definitionForName(QLatin1String("Python"));
QVERIFY(def.isValid());
// indentation
QVERIFY(def.indentationBasedFoldingEnabled());
QCOMPARE(def.foldingIgnoreList(), QStringList() << QLatin1String("(?:\\s+|\\s*#.*)"));
// keyword lists
QVERIFY(!def.keywordLists().isEmpty());
QVERIFY(def.keywordList(QLatin1String("operators")).contains(QLatin1String("and")));
QVERIFY(!def.keywordList(QLatin1String("does not exits")).contains(QLatin1String("and")));
}
void testFormatData()
{
auto def = m_repo.definitionForName(QLatin1String("ChangeLog"));
QVERIFY(def.isValid());
auto formats = def.formats();
QVERIFY(!formats.isEmpty());
// verify that the formats are sorted, such that the order matches the order of the itemDatas in the xml files.
auto sortComparator = [](const KSyntaxHighlighting::Format &lhs, const KSyntaxHighlighting::Format &rhs) { return lhs.id() < rhs.id(); };
QVERIFY(std::is_sorted(formats.begin(), formats.end(), sortComparator));
// check all names are listed
QStringList formatNames;
for (const auto &format : qAsConst(formats)) {
formatNames.append(format.name());
}
const QStringList expectedItemDatas = {QStringLiteral("Normal Text"), QStringLiteral("Name"), QStringLiteral("E-Mail"), QStringLiteral("Date"), QStringLiteral("Entry")};
QCOMPARE(formatNames, expectedItemDatas);
}
void testIncludedDefinitions()
{
auto def = m_repo.definitionForName(QLatin1String("PHP (HTML)"));
QVERIFY(def.isValid());
auto defs = def.includedDefinitions();
const QStringList expectedDefinitionNames = {QStringLiteral("PHP/PHP"),
QStringLiteral("Alerts"),
QStringLiteral("CSS/PHP"),
QStringLiteral("JavaScript/PHP"),
QStringLiteral("Doxygen"),
- QStringLiteral("JavaScript React/PHP"),
+ QStringLiteral("JavaScript React (JSX)/PHP"),
QStringLiteral("TypeScript/PHP"),
QStringLiteral("Mustache/Handlebars (HTML)/PHP"),
QStringLiteral("Modelines"),
QStringLiteral("HTML"),
QStringLiteral("CSS"),
QStringLiteral("SQL (MySQL)"),
QStringLiteral("JavaScript"),
- QStringLiteral("JavaScript React"),
+ QStringLiteral("JavaScript React (JSX)"),
QStringLiteral("TypeScript"),
QStringLiteral("Mustache/Handlebars (HTML)")};
QStringList definitionNames;
for (auto d : defs) {
QVERIFY(d.isValid());
definitionNames.push_back(d.name());
// already check here a bit to make the test fails better fixable
if (definitionNames.size() <= expectedDefinitionNames.size()) {
QCOMPARE(d.name(), expectedDefinitionNames[definitionNames.size() - 1]);
} else {
QCOMPARE(d.name(), QStringLiteral("too many included defs found, first one is this one"));
}
}
QCOMPARE(definitionNames, expectedDefinitionNames);
}
void testIncludedFormats()
{
QStringList definitionNames;
for (const auto &def : m_repo.definitions()) {
definitionNames.push_back(def.name());
}
for (const QString &name : qAsConst(definitionNames)) {
Repository repo;
initRepositorySearchPaths(repo);
auto def = repo.definitionForName(name);
QCOMPARE(m_repo.definitionForName(name).isValid(), def.isValid());
auto includedDefs = def.includedDefinitions();
includedDefs.push_front(def);
// collect all formats, shall be numbered from 1..
QSet formatIds;
for (auto d : qAsConst(includedDefs)) {
const auto formats = d.formats();
for (const auto format : formats) {
// no duplicates
QVERIFY(!formatIds.contains(format.id()));
formatIds.insert(format.id());
}
}
QVERIFY(!def.isValid() || def.name() == QLatin1String("Broken Syntax") || !formatIds.isEmpty());
// ensure all ids are there from 1..size
for (int i = 1; i <= formatIds.size(); ++i) {
QVERIFY(formatIds.contains(i));
}
}
}
void testReload()
{
auto def = m_repo.definitionForName(QLatin1String("QML"));
QVERIFY(!m_repo.definitions().isEmpty());
QVERIFY(def.isValid());
NullHighlighter hl;
hl.setDefinition(def);
auto oldState = hl.highlightLine(QLatin1String("/* TODO this should not crash */"), State());
m_repo.reload();
QVERIFY(!m_repo.definitions().isEmpty());
QVERIFY(!def.isValid());
hl.highlightLine(QLatin1String("/* TODO this should not crash */"), State());
hl.highlightLine(QLatin1String("/* FIXME neither should this crash */"), oldState);
QVERIFY(hl.definition().isValid());
QCOMPARE(hl.definition().name(), QLatin1String("QML"));
}
void testLifetime()
{
// common mistake with value-type like Repo API, make sure this doesn'T crash
NullHighlighter hl;
{
Repository repo;
hl.setDefinition(repo.definitionForName(QLatin1String("C++")));
hl.setTheme(repo.defaultTheme());
}
hl.highlightLine(QLatin1String("/**! @todo this should not crash .*/"), State());
}
void testCustomPath()
{
QString testInputPath = QStringLiteral(TESTSRCDIR "/input");
Repository repo;
QVERIFY(repo.customSearchPaths().empty());
repo.addCustomSearchPath(testInputPath);
QCOMPARE(repo.customSearchPaths().size(), 1);
QCOMPARE(repo.customSearchPaths()[0], testInputPath);
auto customDefinition = repo.definitionForName(QLatin1String("Test Syntax"));
QVERIFY(customDefinition.isValid());
auto customTheme = repo.theme(QLatin1String("Test Theme"));
QVERIFY(customTheme.isValid());
}
void testInvalidDefinition()
{
Definition def;
QVERIFY(!def.isValid());
QVERIFY(def.filePath().isEmpty());
QCOMPARE(def.name(), QLatin1String("None"));
QVERIFY(def.section().isEmpty());
QVERIFY(def.translatedSection().isEmpty());
QVERIFY(def.mimeTypes().isEmpty());
QVERIFY(def.extensions().isEmpty());
QCOMPARE(def.version(), 0);
QCOMPARE(def.priority(), 0);
QVERIFY(!def.isHidden());
QVERIFY(def.style().isEmpty());
QVERIFY(def.indenter().isEmpty());
QVERIFY(def.author().isEmpty());
QVERIFY(def.license().isEmpty());
QVERIFY(!def.foldingEnabled());
QVERIFY(!def.indentationBasedFoldingEnabled());
QVERIFY(def.foldingIgnoreList().isEmpty());
QVERIFY(def.keywordLists().isEmpty());
QVERIFY(def.formats().isEmpty());
QVERIFY(def.includedDefinitions().isEmpty());
QVERIFY(def.singleLineCommentMarker().isEmpty());
QCOMPARE(def.singleLineCommentPosition(), KSyntaxHighlighting::CommentPosition::StartOfLine);
const auto emptyPair = QPair();
QCOMPARE(def.multiLineCommentMarker(), emptyPair);
QVERIFY(def.characterEncodings().isEmpty());
for (QChar c : QStringLiteral("\t !%&()*+,-./:;<=>?[\\]^{|}~")) {
QVERIFY(def.isWordDelimiter(c));
QVERIFY(def.isWordWrapDelimiter(c));
}
}
void testDelimiters()
{
auto def = m_repo.definitionForName(QLatin1String("LaTeX"));
QVERIFY(def.isValid());
// check that backslash '\' and '*' are removed
for (QChar c : QStringLiteral("\t !%&()+,-./:;<=>?[]^{|}~"))
QVERIFY(def.isWordDelimiter(c));
QVERIFY(!def.isWordDelimiter(QLatin1Char('\\')));
// check where breaking a line is valid
for (QChar c : QStringLiteral(",{}[]"))
QVERIFY(def.isWordWrapDelimiter(c));
}
void testFoldingEnabled()
{
// test invalid folding
Definition def;
QVERIFY(!def.isValid());
QVERIFY(!def.foldingEnabled());
QVERIFY(!def.indentationBasedFoldingEnabled());
// test no folding
def = m_repo.definitionForName(QLatin1String("ChangeLog"));
QVERIFY(def.isValid());
QVERIFY(!def.foldingEnabled());
QVERIFY(!def.indentationBasedFoldingEnabled());
// C++ itself has no regions, but it includes ISO C++
def = m_repo.definitionForName(QLatin1String("C++"));
QVERIFY(def.isValid());
QVERIFY(def.foldingEnabled());
QVERIFY(!def.indentationBasedFoldingEnabled());
// ISO C++ itself has folding regions
def = m_repo.definitionForName(QLatin1String("ISO C++"));
QVERIFY(def.isValid());
QVERIFY(def.foldingEnabled());
QVERIFY(!def.indentationBasedFoldingEnabled());
// Python has indentation based folding
def = m_repo.definitionForName(QLatin1String("Python"));
QVERIFY(def.isValid());
QVERIFY(def.foldingEnabled());
QVERIFY(def.indentationBasedFoldingEnabled());
}
void testCharacterEncodings()
{
auto def = m_repo.definitionForName(QLatin1String("LaTeX"));
QVERIFY(def.isValid());
const auto encodings = def.characterEncodings();
QVERIFY(!encodings.isEmpty());
QVERIFY(encodings.contains({QChar(196), QLatin1String("\\\"{A}")}));
QVERIFY(encodings.contains({QChar(227), QLatin1String("\\~{a}")}));
}
void testIncludeKeywordLists()
{
Repository repo;
QTemporaryDir dir;
// forge a syntax file
{
QVERIFY(QDir(dir.path()).mkpath(QLatin1String("syntax")));
const char syntax[] = R"xml(
c
- a
- b
a
- c
b
- d
e##AAA
- e
f
- f
)xml";
QFile file(dir.path() + QLatin1String("/syntax/a.xml"));
QVERIFY(file.open(QIODevice::WriteOnly));
QTextStream stream(&file);
stream << syntax;
}
repo.addCustomSearchPath(dir.path());
auto def = repo.definitionForName(QLatin1String("AAA"));
QCOMPARE(def.name(), QLatin1String("AAA"));
auto klist1 = def.keywordList(QLatin1String("a"));
auto klist2 = def.keywordList(QLatin1String("b"));
auto klist3 = def.keywordList(QLatin1String("c"));
// internal QHash is arbitrarily ordered and undeterministic
auto &klist = klist1.size() == 3 ? klist1 : klist2.size() == 3 ? klist2 : klist3;
QCOMPARE(klist.size(), 3);
QVERIFY(klist.contains(QLatin1String("a")));
QVERIFY(klist.contains(QLatin1String("b")));
QVERIFY(klist.contains(QLatin1String("c")));
klist = def.keywordList(QLatin1String("d"));
QCOMPARE(klist.size(), 3);
QVERIFY(klist.contains(QLatin1String("d")));
QVERIFY(klist.contains(QLatin1String("e")));
QVERIFY(klist.contains(QLatin1String("f")));
klist = def.keywordList(QLatin1String("e"));
QCOMPARE(klist.size(), 2);
QVERIFY(klist.contains(QLatin1String("e")));
QVERIFY(klist.contains(QLatin1String("f")));
klist = def.keywordList(QLatin1String("f"));
QCOMPARE(klist.size(), 1);
QVERIFY(klist.contains(QLatin1String("f")));
}
void testKeywordListModification()
{
auto def = m_repo.definitionForName(QLatin1String("Python"));
QVERIFY(def.isValid());
const QStringList &lists = def.keywordLists();
QVERIFY(!lists.isEmpty());
const QString &listName = lists.first();
const QStringList keywords = def.keywordList(listName);
QStringList modified = keywords;
modified.append(QLatin1String("test"));
QVERIFY(def.setKeywordList(listName, modified) == true);
QCOMPARE(keywords + QStringList(QLatin1String("test")), def.keywordList(listName));
const QString &unexistedName = QLatin1String("unexisted-keyword-name");
QVERIFY(lists.contains(unexistedName) == false);
QVERIFY(def.setKeywordList(unexistedName, QStringList()) == false);
}
};
}
QTEST_GUILESS_MAIN(KSyntaxHighlighting::RepositoryTest)
#include "syntaxrepository_test.moc"
diff --git a/data/syntax/html.xml b/data/syntax/html.xml
index 7f0d52b..4b7d7b2 100644
--- a/data/syntax/html.xml
+++ b/data/syntax/html.xml
@@ -1,316 +1,316 @@
]>
-
+
-
+
diff --git a/data/syntax/javascript-react.xml b/data/syntax/javascript-react.xml
index c9dbf2f..a0f110d 100644
--- a/data/syntax/javascript-react.xml
+++ b/data/syntax/javascript-react.xml
@@ -1,382 +1,383 @@
]>
-
diff --git a/data/syntax/markdown.xml b/data/syntax/markdown.xml
index 7d11b34..dd203f6 100644
--- a/data/syntax/markdown.xml
+++ b/data/syntax/markdown.xml
@@ -1,638 +1,638 @@
]>
-
+
-
+
diff --git a/data/syntax/typescript-react.xml b/data/syntax/typescript-react.xml
index c3b7d77..845e333 100644
--- a/data/syntax/typescript-react.xml
+++ b/data/syntax/typescript-react.xml
@@ -1,496 +1,497 @@
]>
-