diff --git a/autotests/folding/example.rmd.fold b/autotests/folding/example.rmd.fold index 780c800..65745f3 100644 --- a/autotests/folding/example.rmd.fold +++ b/autotests/folding/example.rmd.fold @@ -1,68 +1,68 @@ --- -title: "test" -author: "me" -date: "07.10.2014" +title: "test" +author: "me" +date: "07.10.2014" output: html_document --- This is a simple test document. It shows syntax highlighting switches between YAML (above), R blocks ```{r, echo=FALSE} -for (i in 1:10) { +for (i in 1:10) { if(i>=10) print(i) -} +} # two blank lines below sessionInfo() ``` LaTeX equations, $$ h_{i}(t \mid q,C) = h_{0}(t) e^{\beta_{1}quality_{i} + \beta_{2}C_{iq}} $$ and Markdown. A [link](http://example.com) in Markdown. Inline `r y <- 5 + x - sin(3)` R code. Inline `y <- 5 + x - sin(3)` code. Heading ======= Sub-heading ----------- A list of editors: * kate * vim * emacs *italic*, **bold**, `monospace` code block more code normal text normal text normal text 1. item * This is a list item with multiple lines. ```{r pressure, echo=FALSE} plot(pressure) ``` > This is a blockquote `r cos(33) ` This is a new paragraph, which is part of this $$ \text{item} $$. indented code block Other paragraph. * subitem * subitem $$ A = B + C $$ diff --git a/autotests/folding/highlight.js.fold b/autotests/folding/highlight.js.fold index 67d5a70..507c417 100644 --- a/autotests/folding/highlight.js.fold +++ b/autotests/folding/highlight.js.fold @@ -1,139 +1,161 @@ -/* test.js - test for javascript.xml syntax file */ +/* test.js - test for javascript.xml syntax file */ // Note: this script will not, and is not supposed to, compile in any js engine. -/* +/* NOTE: The words "todo", "fixme" and "note" should be rendered in a different style within comments, match should be caseless (to test for regexp insensitive attribute). - The regex used for this rule is */ + The regex used for this rule is */ String = /\b(?:fixme|todo|note)\b/ - /* Thus, for example "Notebook" is not caught by + /* Thus, for example "Notebook" is not caught by this rule. (the "?:" in the subpattern is there to avoid the regex engine wasting time saving a backref, which is not used for anything. I do not know if the overhead of parsing that is greater than the time saved by not capturing the text...) The rule for catching these words is placed in a context "Comment common", which is used by both comment contexts (single line, multiline) using the new "IncludeRules" item. -*/ +*/ // test if regex support works - nice with new fallthrough prop in context:) somestring.replace( /dooh/ , "bah!"); re=/foo/ig; // hehe somestring.search( /^foo\w+\s\d{0,15}$/ ); re = /dooh/; // This is supposedly legal: re = somebool ? /foo/ : /bar/; // NOTE - Special case: an empty regex, not a comment. // The rule uses a positive lookahead assertion to catch it: "//(?=;)". re = //; re = /a|b/; -/* +/* Tests for the regex parser. It will parse classes, quanitfiers, special characters and regex operaters, as specified in the netscape documentation for javascript. Regexps are only parsed in their clean form, as the RegExp(string) constructor is using a quoted string. TODO: Find out if more regex feats should be supported. Consider using more itemDatas - assertion, quantifier are options. -*/ +*/ re = /^text\s+\d+\s*$/; re = /a pattern with caret $^$ in it/; re = /(\d{0,4})\D/; re = /[a-zA-Z_]+/; re = /[^\d^]+/; re = /\s+?\w+\.$/; re = /\/\//; re = /a|b/; // the following are not regexps in E4X (=xml embedded into JavaScript) var p =

Hello World

The following parameters were detected:

<%-- Display the parameters which might have been passed in. --%> <%-- Label; Actual Parameter String; Value Detected --%> <%-- Label; Actual Parameter String; Value Detected --%> <%-- Label; Actual Parameter String; Value Detected --%> <%-- Label; Actual Parameter String; Value Detected --%> <%-- Label; Actual Parameter String; Value Detected --%>

PARAMETER_1	<%=PARAMETER_1%>	"<%=parm1%>"
PARAMETER_2	<%=PARAMETER_2%>	"<%=parm2%>"
PARAMETER_3	<%=PARAMETER_3%>	"<%=parm3%>"
PARAMETER_4	<%=PARAMETER_4%>	"<%=parm4%>"
PARAMETER_5	<%=PARAMETER_5%>	"<%=parm5%>"

<%-- Display our list of random Integers (shows code folding). --%> <% - if (intList != null && intList.size() > 0) { + if (intList != null && intList.size() > 0) { %> <% Iterator intListIt = intList.iterator(); - while (intListIt.hasNext()) { + while (intListIt.hasNext()) { Integer i = (Integer) intListIt.next(); %> <% - } - } else { + } + } else { %> <% - } + } %>

Here are the elements of intList...

<%=i.toString()%>

Oooops, we forgot to initialize intList!

<%-- We can call javascript functions. --%>

Test our javascript...

<%-- If we actually had defined a tag library. --%>

<%-- Expression language. --%>

myParam's value: ""

<%! - /* A place for class variables and functions... */ + /* A place for class variables and functions... */ // Define some sample parameter names that this page might understand. private static final String PARAMETER_1 = "p1"; private static final String PARAMETER_2 = "p2"; private static final String PARAMETER_3 = "p3"; private static final String PARAMETER_4 = "p4"; private static final String PARAMETER_5 = "p5"; // Returns str trimmed, or an empty string if str is null. - private static String noNull(String str) { + private static String noNull(String str) { String retStr; if (str == null) retStr = ""; else retStr = str.trim(); return retStr; - } + } // Returns a list of Integers with listSize elements. - private static List getIntList(int listSize) { + private static List getIntList(int listSize) { ArrayList retList = new ArrayList(listSize); for (int i = 0; i < listSize; i++) retList.add(new Integer( (int) (Math.random() * 100) )); return retList; - } + } %> diff --git a/autotests/folding/highlight.php.fold b/autotests/folding/highlight.php.fold index 27891d7..ede0f87 100644 --- a/autotests/folding/highlight.php.fold +++ b/autotests/folding/highlight.php.fold @@ -1,69 +1,69 @@ /* This is a pseudo PHP file to test Kate's PHP syntax highlighting. */ # TODO: this is incomplete, add more syntax examples! # this is also a comment. // Even this is a comment function test($varname) { return "bla"; # this is also a comment } ?> test"; ?> > - .inputText { + .inputText { width: px; text-indent: 10px; - } + } > > var some_js_var = ; > type="text/babel"> - > > /* aaa */ ?> >> - function a(i) { + > > /* aaa */ ?> >> + function a(i) { - return >{ i + j }>; - } + return >{ i + j }>; + } > type="text/typescript"> - class DateTime { + class DateTime { info: string; - constructor() { this.info = ; } - get() { return this.info; } - } + constructor() { this.info = ; } + get() { return this.info; } + } > type="x-tmpl-mustache"> - {{! }} - {{#movie}} - > + {{! }} + {{#movie}} + >

- {{ratings.critics_rating}} - > - {{/movie}} + > + {{/movie}} > << This is the $string inside the variable (which seems to be rendered as a string) It works well, I think. DOOH # bug 382527 throw new ParserException("Test {$this->some_var[$index]}\nin {$this->file} is missing.\nThis is bad."); ?> diff --git a/autotests/folding/test.coffee.fold b/autotests/folding/test.coffee.fold index de7ad09..f71cbb1 100644 --- a/autotests/folding/test.coffee.fold +++ b/autotests/folding/test.coffee.fold @@ -1,71 +1,75 @@ # CoffeeScript test # Source: https://coffeescript.org ### Multiline comment ### import 'local-file.coffee' # Assignment: number = 42 opposite = true # Conditions: number = -42 if opposite # Functions: square = (x) -> x * x # Arrays: list = [1, 2, 3, 4, 5] # Objects: math = root: Math.sqrt square: square cube: (x) -> x * square x # Splats: race = (winner, runners...) -> print winner, runners # Existence: alert "I knew it!" if elvis? # Array comprehensions: cubes = (math.cube num for num in list) # Classes: class Animal constructor: (@name) -> move: (meters) -> alert @name + " moved #{meters}m." # Switch/When/Else: switch day when "Mon" then go work when "Tue" then go relax when "Thu" then go iceFishing when "Fri", "Sat" if day is bingoDay go bingo go dancing when "Sun" then go church else go work # Member objects: Object.prop. Object .Object Object timelineEvent.class # Embedded JavaScript Code markdown = `function () { return \`In Markdown, write code like \\\`this\\\`\`; }` ``` // Comment var array = new Array(500); var name = "Willy"; alert(`Hello ${name}!`); ``` ` String.raw\`String ${x} \` ` + +` // Regular Expression after template + const a = \`6\` / 2; /*comment*/ + \`template\` /regex/ ` diff --git a/autotests/folding/test.htm.fold b/autotests/folding/test.htm.fold index c8747a9..de497eb 100644 --- a/autotests/folding/test.htm.fold +++ b/autotests/folding/test.htm.fold @@ -1,74 +1,74 @@ HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> This is a title > /* comment */ #xyz { color: red; } h1 { font: "Comic Sans"; } >

Hello, {{ name }}!

> document.body.appendChild(document.createTextNode('Hello World!')); // comment > type="text/typescript"> - class Student { + class Student { fullName: string; - constructor(public firstName: string, public middleInitial: string, public lastName: string) { + constructor(public firstName: string, public middleInitial: string, public lastName: string) { this.fullName = firstName + " " + middleInitial + " " + lastName; - } - } + } + } let a: null = null; let b: number = 12___3; > src="https://unpkg.com/babel-standalone@6/babel.min.js">> type="text/babel"> ReactDOM.render( - >Hello, world!>, + >Hello, world!>, document.getElementById('root') ); - function Story(props) { - const SpecificStory = components[props.storyType]; - return story={ props.story } attr2="&ref;" attr3="Hello\n" />; - } + function Story(props) { + const SpecificStory = components[props.storyType]; + return story={ props.story } attr2="&ref;" attr3="Hello\n" />; + } > type="x-tmpl-mustache"> - {{#movie}} - > + {{#movie}} + >

- > - > + > + > Rating - {{ratings.critics_rating}} - > - {{/movie}} - {{^movie}} - > + > + {{/movie}} + {{^movie}} + > Movie Does Not Exist :( - > - {{/movie}} - {{! comment }} + > + {{/movie}} + {{! comment }} > type="text/html">

Hello

> > ? > diff --git a/autotests/folding/test.js.fold b/autotests/folding/test.js.fold index 5e2a92e..397b095 100644 --- a/autotests/folding/test.js.fold +++ b/autotests/folding/test.js.fold @@ -1,26 +1,43 @@ #! shebang #! no-shebang -/* comment */ +/* comment */ function fun() { - var boo = { 'key': [ 1, 2.0, 3.0e1, 004, 0x5 ] }; + var boo = { 'key': [ 1, 2.0, 3.0e1, 004, 0x5 ] }; } class MyClass; // reserved keywords // Member objects: text after "." object.property instanceof Number; iden1.iden2 . iden3.class class; var escapes = "aa\b\n\0a\"a\x12a\32a\u{123}a\$\%\ \#\y\aaa\ aaa"; var octal = 0o124; var bin = 0b1010; -ლಠ益ಠლ.ñá = 42; -δ /No-RegExp/ +日本語().ლಠ益ಠლ.ñá = 42; +δ /No-Regex/ -/* Modelines: finish comment in incomplete Modeline: - * kate: replace-tabs */ normal text +// Only highlight valid regular expressions, of a single line, after strings +// See: https://github.com/microsoft/TypeScript-TmLanguage/issues/786 +"text" /No-Regex +"text" /Regex[:)]*/; +const a = "6" / 2; /*comment*/ const b = 5; +console.log("4" / "2"); // 2 +// Single quote +const a = '6' / 2; /*comment*/ const b = 5; +console.log('4' / '2'); // 2 +// Template +const a = `6` / 2; /*comment*/ const b = 5; +console.log(`4` / `2`); // 2 + +// Built-in +const os = require('os'); +JSON.stringify("hello"); +console.error("hello"); +Math.LOG10E; +Number.MAX_SAFE_INTEGER; diff --git a/autotests/folding/test.jsx.fold b/autotests/folding/test.jsx.fold index ad75228..9d15c8e 100644 --- a/autotests/folding/test.jsx.fold +++ b/autotests/folding/test.jsx.fold @@ -1,96 +1,98 @@ // JavaScript React -/** @author Willy - * @url https://reactjs.org/ **/ +/** @author Willy + * @url https://reactjs.org/ **/ import React from 'react'; -import { PhotoStory, VideoStory } from './stories'; +import { PhotoStory, VideoStory } from './stories'; -function Story(props) { - const SpecificStory = components[props.storyType]; - return story={ props.story } attr2="&ref;" attr3="Hello\n" />; -} +function Story(props) { + const SpecificStory = components[props.storyType]; + return story={ props.story } attr2="&ref;" attr3="Hello\n" />; +} function - attr1={ /> function return class var 0x123 { } &noRef; hello() React.Component() } attr2="&ref;"> - /* no comment*/ function /> return class var 0x123 &ref; hello() React.Component() - ./> anyWord /> - { function return class var 0x123 hello() React.Component() } -> + attr1={ /> function return class var 0x123 { } &noRef; hello() React.Component() } attr2="&ref;"> + /* no comment*/ function /> return class var 0x123 &ref; hello() React.Component() + ./> anyWord /> + { function return class var 0x123 hello() React.Component() } +> -> > -> > -> > +> > +> > +> > -/*comment*/attr1/*comment*/= /*comment*/"value"/*comment*/attr2 /*comment*/attr3='a' key/*comment*/key2 /> +/*comment*/attr1/*comment*/= /*comment*/"value"/*comment*/attr2 /*comment*/attr3='a' key/*comment*/key2 /> // Detect Valid tags -/* comment */ >> -{ /* comment - */ /> - word . } -return /* comment - multiline */ /> /* comment */ /> -&& /*comment*/ /> -& /*comment*/ - - /> -{ >Hello> } -? />; -[ /> ( /> -,/> =/> -&&/> ||/> -return /> ; -default/> ; -> > /> > return > +/* comment */ >> +{ /* comment + */ /> + word . } +return /* comment + multiline */ /> /* comment */ /> +&& /*comment*/ /> +& /*comment*/ + + /> +{ >Hello> } +? />; +[ /> ( /> ] +,/> =/> +&&/> ||/> +return /> ; +default/> ; +> > /> > return > anyWord -anyWord/*comment*/ +anyWord/*comment*/ . & | -% /* comment*/ - -/> -> > - -/> +% /* comment*/ // Non-ASCII tag name & attribute -<日本語>>; - 本本:本-本 aa本:本 aa:aa /> +<日本語>>; + 本本:本-本 aa本:本 aa:aa /> - />; - { ... x } y -={2 } z />; + />; + { ... x } y +={2 } z />; -let k1 = > > Hello > > world >>; -let k2 = > > Hello > >; +let k1 = > > Hello > > world >>; +let k2 = > > Hello > >; // Empty tags -<>; // no whitespace -< >; // lots of whitespace -< /*starting wrap*/ >/*ending wrap*/>; // comments in the tags -<>hi; // text inside -<>>hi>>bye>; // children -<>>1><>>2.1>>2.2>>3>; // nested fragments -<>#; // # would cause scanning error if not in jsxtext +<>; // no whitespace +< >; // lots of whitespace +< /*starting wrap*/ >/*ending wrap*/>; // comments in the tags +<>hi; // text inside +<>>hi>>bye>; // children +<>>1><>>2.1>>2.2>>3>; // nested fragments +<>#; // # would cause scanning error if not in jsxtext // Tags after substitutions in templates -`aaa${>>//comment - /*comment*//>}` +`aaa${>>//comment + /*comment*//>}` // Don't highlight tags within variable declaration let myIdentity: (arg: T) => T = identity; var myIdentity: (arg: U) => U = identity; -const myIdentity: {<T>(arg: T): T} = identity; +const myIdentity: {<T>(arg: T): T} = identity; // Don't highlight tags within interfaces and classes -interface GenericIdentityFn { +interface GenericIdentityFn { (arg: T): T; -} -class Handler { +} +class Handler { info: (arg: T): T ; - > > -} + > > +} + +// Check character after tag name, do not highlight invalid tags +/* comment */ ? +/*comment*/# diff --git a/autotests/folding/test.markdown.fold b/autotests/folding/test.markdown.fold index b9a41a4..82c3baa 100644 --- a/autotests/folding/test.markdown.fold +++ b/autotests/folding/test.markdown.fold @@ -1,582 +1,582 @@ --- Title: A Sample Markdown Document Author: Fletcher T. Penney Date: February 9, 2011 Comment: This is a comment intended to demonstrate metadata that spans multiple lines. --- # H1 ## H2 ### H3 Multi-line paragraph bla bla bla bla bla bla. Intentional line break via two spaces at line. Formats: _italic_, **bold**, `monospace`, ~~strikeout~~ Bullet list: * item1 * item2 Numbered list: 1. item 1 2. item 2 Task list: - [x] Finish my changes - [ ] Push my commits - [ ] Open a pull request A link as normal text: http://example.com [link](http://kde.org) Auto-link: Mail: This is [an example](http://example.com/ "Title") inline link. See my [About](/about/) page for details. This is [an example] [id] reference-style link. [id]: http://example.com/ "Optional Title Here" [foo]: http://example.com/ 'Optional Title Here' [bar]: http://example.com/ (Optional Title Here) [id2]: "Optional Title Here" ![Alt text](/path/to/img.jpg) ![Alt text](/path/to/img.jpg "Optional title") [![Alt text](https://url/to/img.svg)](https://link.com/example/) code 1 code 2 normal text > block quote _italic_ > more block quote normal text Title: some text normal text # Lists 1. item * This is a list item with multiple lines. ``` code ``` > This is a blockquote This is a new paragraph, which is part of the item in the previous list. indented code block Other paragraph. * subitem * subitem with multiple lines. New paragraph of the previous subitem. code block ----------------------- Other paragraph of the subitem. 30. numlist item 31. numlist item New paragraph of the previous item. > Blockquote code block Other paragraph. # Inline HTML © bold code -> +> a b - > + >

- > + > e -> +> normal text *italic* # Code `simple code` ``simple ` code`` ```simple `` ` code ``` ````simple`code```` normal text normal text normal text normal text code blocks are only allowed after an empty line. * list list normal text 1. num-list num-list normal text > quote quote code block normal code normal code # Fenced code blocks (bug 356974) ## Bash ```bash #!/usr/bin/env bash for f in *; do echo "$f" done ``` ## C++ ```cpp #include class Q : public QObject { Q_OBJECT public: Q(); } Q::Q() :QObject(NULL) { } ``` ## C ```c #include #include "stdint.h" #define SOME_VAR 1 static uint64_t intWithSuffix = 42ull + ~1233L; static int octNum = 07232; ``` ## C# ## ```csharp var arr = new[] { 0, 1, 2, 3, 4 }; var anon = new { Country = "Germany", Inhabitants = 80000000 }; ``` ## CMake ```cmake cmake_minimum_required(VERSION 3.10 FATAL_ERROR) project (hello_world) set(QT_MIN_VERSION "5.6.0") ``` ## CSS ```css h1.main::hover { font-size: 100; color: green; } ``` ## Email ```email From: Konqi Dragon To: All Subject: highlights ``` ## Go ```go package main import "fmt" func main() { fmt.Println("Hola, mundo.") } ``` ## Haskell ```haskell module Main (main) where main :: IO () main = putStrLn "Hello, World!" ``` ## HTML ```html

Hello world!

``` ## Java ```java package fibsandlies; import java.util.HashMap; -/** +/** * This is an example of a Javadoc comment; Javadoc can compile documentation * from this text. Javadoc comments must immediately precede the class, method, or field being documented. - */ -public class FibCalculator extends Fibonacci implements Calculator { + */ +public class FibCalculator extends Fibonacci implements Calculator { private static Map memoized = new HashMap(); - public static void main(String[] args) { + public static void main(String[] args) { memoized.put(1, 1); memoized.put(2, 1); System.out.println(fibonacci(12)); - } -} + } +} ``` ## JavaScript ```js function factorial(n) { if (n === 0) { return 1; // 0! = 1 } return n * factorial(n - 1); } ``` ## JavaScript React (JSX) ```jsx - /> -function Story(props) { - const SpecificStory = components[props.storyType]; - return story={ props.story } attr2="&ref;" attr3="Hello\n" />; -} + /> +function Story(props) { + const SpecificStory = components[props.storyType]; + return story={ props.story } attr2="&ref;" attr3="Hello\n" />; +} ``` ## JSON ```json -[{ +[{ "hello": "world", "count": 1, "bool": true -}] +}] ``` ## Matlab ```matlab % Numbers _____________________________________________ 5, 5.5, .1, 0.1, 0.4e5, 1.2e-5, 5i, 5.3i, 6j, .345+3i 5', 5.5', .1', 0.1', 0.4e5', 1.2e-5', 5i', 5.3i', 6j', .345+3i' ``` ## Markdown ```markdown **bold** `code` > quote ``` ## Mustache/Handlebars ```handlebars -{{#movie}} - > +{{#movie}} + >

- > - > + > + > Rating - {{ratings.critics_rating}} - > -{{/movie}} + > +{{/movie}} ``` ## Perl ```perl my $var = shift; -$var =~ s/bla/foo/igs; -$var =~ s!bla!foo!igs; -$var =~ s#bla#foo#igs; +$var =~ s/bla/foo/igs; +$var =~ s!bla!foo!igs; +$var =~ s#bla#foo#igs; ``` ## PHP ```php namespace Application\Controller; use Zend\Mvc\Controller\AbstractActionController; class IndexController extends AbstractActionController -{ -} +{ +} ``` ## Python ```python -def addXToY(x, y): +def addXToY(x, y): total = x + y print total ``` ## QML ```qml -Text { +Text { id: hello width: 100 text: "Hello world!" -} +} ``` ## R ```r # Declare function “f” with parameters “x”, “y“ # that returns a linear combination of x and y. -f <- function(x, y) { +f <- function(x, y) { z <- 3 * x + 4 * y return(z) -} +} ``` ## Ruby ```ruby require 'Config' - def CGI::escape(string) - string.gsub(/([^ a-zA-Z0-9_.-]+)/n) do + def CGI::escape(string) + string.gsub(/([^ a-zA-Z0-9_.-]+)/n) do '%' + $1.unpack('H2' * $1.size).join('%').upcase - end.tr(' ', '+') - end + end.tr(' ', '+') + end ``` ## Rust ```rust -fn main() { +fn main() { println!("Hello world!"); -} +} ``` ## MySQL ```mysql -- comment CREATE TABLE stuff COLUMNS(col1 INT, col2 Varchar); SELECT * FROM stuff WHERE id = 'string'; select * from stuff where id < 0.42; Select col1, col2 From stuff Where stuff.col1 IS NOT NuLL; ``` ## TypeScript ```ts -class Student { +class Student { fullName: string; - constructor(public firstName: string, public middleInitial: string, public lastName: string) { + constructor(public firstName: string, public middleInitial: string, public lastName: string) { this.fullName = firstName + " " + middleInitial + " " + lastName; - } -} + } +} ``` ## XML ```xml - attribute="3"> - /> -> + attribute="3"> + /> +> ``` ## reStructuredText ```rst Section Header ============== .. image:: /path/to/image.jpg - A bullet list item ``` ## Doxygen ```doxygen a normal member taking two arguments and returning an integer value. @param a an integer argument. @param s a constant character pointer. @see Javadoc_Test() @see publicVar() @return The test results ``` ## No language specified ``` No language is specified, but it should be still rendered as code block. ``` # Fenced code blocks with more than 3 backticks or tildes ~~~ Fenced code block with 3 tildes. ~~~ ````````` Some implementations of Markdown/MultiMarkdown support more than 3 backticks or tildes. ``` The block ends with the same amount of backticks. ````````` ~~~~~~~~~~~~ Fenced code block with more tildes. ~~~~~~~~~~~~ ## With languages ```````html

Hello world!

a	b
c d	e

{{title}}

{{title}}

{{title}}

Hello

world

Hello

Hello

world

Hello

{user.name}

Hello

{{title}}

Hello, world!

{{title}}

Hello

world

Hello

{{title}}

Hello

world

Hello

`{`user.`}`

Hello