From c4b47ba0237e04171aac7538a8e626016450afd3 Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Sat, 6 Oct 2018 16:08:56 -0400 Subject: [PATCH 1/3] Add escape characters to language examples --- language-examples/html.html | 21 +++++++++++++++++++++ language-examples/javascript.js | 1 + language-examples/typescript.ts | 1 + 3 files changed, 23 insertions(+) create mode 100644 language-examples/html.html diff --git a/language-examples/html.html b/language-examples/html.html new file mode 100644 index 0000000..6d41072 --- /dev/null +++ b/language-examples/html.html @@ -0,0 +1,21 @@ + + + + Page title + + +

First-level header

+ +

Second-level header

+ + +

Another second-level header

+

+ This paragraph contains an escape—namely, the em dash. +

+ + \ No newline at end of file diff --git a/language-examples/javascript.js b/language-examples/javascript.js index 7fb47d6..0cc0898 100644 --- a/language-examples/javascript.js +++ b/language-examples/javascript.js @@ -6,6 +6,7 @@ function func(param) { } var number = 0; var templateLiterals = `a ${text} b ${1 + 2} c`; + var escapes = 'line 1\nline 2'; return { "text": text, "boolean": false, diff --git a/language-examples/typescript.ts b/language-examples/typescript.ts index 6dcb7bd..2388ee6 100644 --- a/language-examples/typescript.ts +++ b/language-examples/typescript.ts @@ -6,6 +6,7 @@ function func(param: string): object { } var number = 0; var templateLiterals = `a ${text} b ${1 + 2} c`; + var escapes = 'line 1\nline 2'; return { "text": text, "boolean": false, From 319e0446686a185c830a87df0495a2f476233147 Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Sat, 6 Oct 2018 16:09:08 -0400 Subject: [PATCH 2/3] Add `stringEscape` to `syntax` --- src/color.ts | 1 + src/interfaces.ts | 1 + src/rules.ts | 1 + 3 files changed, 3 insertions(+) diff --git a/src/color.ts b/src/color.ts index 61ad505..298ba03 100644 --- a/src/color.ts +++ b/src/color.ts @@ -58,6 +58,7 @@ export function generateFallbackColorSet(s: IBaseColorSet, type: 'light' | 'dark number: s.color4, storage: s.color1, string: s.color2, + stringEscape: (type === 'light' ? darken : lighten)(s.color2, 0.5), comment: (type === 'light' ? darken : lighten)(s.background, 2.0), class: s.color3, classMember: s.color3, diff --git a/src/interfaces.ts b/src/interfaces.ts index b7186e6..e0f7d51 100644 --- a/src/interfaces.ts +++ b/src/interfaces.ts @@ -25,6 +25,7 @@ export interface IColorSet { number?: string; storage?: string; string?: string; + stringEscape?: string; comment?: string; class?: string; classMember?: string; diff --git a/src/rules.ts b/src/rules.ts index 4a2e3bc..31bd315 100644 --- a/src/rules.ts +++ b/src/rules.ts @@ -71,6 +71,7 @@ export const tokenRules: IRuleGenerator[] = [ // string: It's important that string is put first so that other scopes can override strings // within template expressions { color: s => s.syntax.string, generate: getSimpleColorGenerator('String', 'string') }, + { color: s => s.syntax.stringEscape, generate: getSimpleColorGenerator('String Escape', 'constant.character.escape, text.html constant.character.entity.named, punctuation.definition.entity.html') }, { color: s => s.syntax.boolean, generate: getSimpleColorGenerator('Boolean', 'constant.language.boolean') }, { color: s => s.syntax.number, generate: getSimpleColorGenerator('Number', 'constant.numeric') }, { color: s => s.syntax.identifier, generate: getSimpleColorGenerator('Identifier', 'variable, support.variable, support.class, support.constant, meta.definition.variable entity.name.function') }, From 3ff8f58116de5b094d0a836e159964991457afb2 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Sun, 7 Oct 2018 10:59:38 -0700 Subject: [PATCH 3/3] Add some more language examples --- language-examples/csharp.cs | 1 + language-examples/java.java | 1 + language-examples/markdown.md | 1 + 3 files changed, 3 insertions(+) create mode 100644 language-examples/csharp.cs create mode 100644 language-examples/java.java create mode 100644 language-examples/markdown.md diff --git a/language-examples/csharp.cs b/language-examples/csharp.cs new file mode 100644 index 0000000..53a247c --- /dev/null +++ b/language-examples/csharp.cs @@ -0,0 +1 @@ +String stringEscapes = "a\nb"; diff --git a/language-examples/java.java b/language-examples/java.java new file mode 100644 index 0000000..53a247c --- /dev/null +++ b/language-examples/java.java @@ -0,0 +1 @@ +String stringEscapes = "a\nb"; diff --git a/language-examples/markdown.md b/language-examples/markdown.md new file mode 100644 index 0000000..277265b --- /dev/null +++ b/language-examples/markdown.md @@ -0,0 +1 @@ +String escapes