daohualiuxiang
/
vscode
mirror of https://github.com/microsoft/vscode.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[pug] Use pug grammar & rename language id. Fixes #50086

pull/50272/merge
Martin Aeschlimann 2018-05-22 10:52:19 +02:00
parent f92bacec32
commit b217a7f236
12 changed files with 656 additions and 673 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/gulpfile.vscode.js
View File

@ -141,7 +141,7 @@ const config = {
name: product.nameLong + ' document',
role: 'Editor',
ostypes: ["TEXT", "utxt", "TUTX", "****"],
extensions: ["ascx", "asp", "aspx", "bash", "bash_login", "bash_logout", "bash_profile", "bashrc", "bat", "bowerrc", "c", "cc", "clj", "cljs", "cljx", "clojure", "cmd", "code-workspace", "coffee", "config", "cpp", "cs", "cshtml", "csproj", "css", "csx", "ctp", "cxx", "dockerfile", "dot", "dtd", "editorconfig", "edn", "eyaml", "eyml", "fs", "fsi", "fsscript", "fsx", "gemspec", "gitattributes", "gitconfig", "gitignore", "go", "h", "handlebars", "hbs", "hh", "hpp", "htm", "html", "hxx", "ini", "jade", "jav", "java", "js", "jscsrc", "jshintrc", "jshtm", "json", "jsp", "less", "lua", "m", "makefile", "markdown", "md", "mdoc", "mdown", "mdtext", "mdtxt", "mdwn", "mkd", "mkdn", "ml", "mli", "php", "phtml", "pl", "pl6", "pm", "pm6", "pod", "pp", "profile", "properties", "ps1", "psd1", "psgi", "psm1", "py", "r", "rb", "rhistory", "rprofile", "rs", "rt", "scss", "sh", "shtml", "sql", "svg", "svgz", "t", "ts", "txt", "vb", "wxi", "wxl", "wxs", "xaml", "xcodeproj", "xcworkspace", "xml", "yaml", "yml", "zlogin", "zlogout", "zprofile", "zsh", "zshenv", "zshrc"],
extensions: ["ascx", "asp", "aspx", "bash", "bash_login", "bash_logout", "bash_profile", "bashrc", "bat", "bowerrc", "c", "cc", "clj", "cljs", "cljx", "clojure", "cmd", "code-workspace", "coffee", "config", "cpp", "cs", "cshtml", "csproj", "css", "csx", "ctp", "cxx", "dockerfile", "dot", "dtd", "editorconfig", "edn", "eyaml", "eyml", "fs", "fsi", "fsscript", "fsx", "gemspec", "gitattributes", "gitconfig", "gitignore", "go", "h", "handlebars", "hbs", "hh", "hpp", "htm", "html", "hxx", "ini", "jade", "jav", "java", "js", "jscsrc", "jshintrc", "jshtm", "json", "jsp", "less", "lua", "m", "makefile", "markdown", "md", "mdoc", "mdown", "mdtext", "mdtxt", "mdwn", "mkd", "mkdn", "ml", "mli", "php", "phtml", "pl", "pl6", "pm", "pm6", "pod", "pp", "profile", "properties", "ps1", "psd1", "psgi", "psm1", "pug", "py", "r", "rb", "rhistory", "rprofile", "rs", "rt", "scss", "sh", "shtml", "sql", "svg", "svgz", "t", "ts", "txt", "vb", "wxi", "wxl", "wxs", "xaml", "xcodeproj", "xcworkspace", "xml", "yaml", "yml", "zlogin", "zlogout", "zprofile", "zsh", "zshenv", "zshrc"],
iconFile: 'resources/darwin/code_file.icns'
}],
darwinBundleURLTypes: [{

2
build/npm/update-grammar.js
View File

@ -83,7 +83,7 @@ exports.update = function (repoId, repoPath, dest, modifyGrammar, version = 'mas
grammar = plist.parse(content);
} else if (ext === '.cson') {
grammar = cson.parse(content);
} else if (ext === '.json') {
} else if (ext === '.json' || ext === '.JSON-tmLanguage') {
grammar = JSON.parse(content);
} else {
return Promise.reject(new Error('Unknown file extension: ' + ext));

2
extensions/markdown-basics/package.json
View File

@ -57,7 +57,7 @@
"meta.embedded.block.dockerfile": "dockerfile",
"meta.embedded.block.go": "go",
"meta.embedded.block.groovy": "groovy",
"meta.embedded.block.jade": "jade",
"meta.embedded.block.pug": "pug",
"meta.embedded.block.javascript": "javascript",
"meta.embedded.block.json": "json",
"meta.embedded.block.less": "less",

8
extensions/markdown-basics/syntaxes/markdown.tmLanguage.json
View File

@ -109,7 +109,7 @@
"include": "#fenced_code_block_groovy"
},
{
"include": "#fenced_code_block_jade"
"include": "#fenced_code_block_pug"
},
{
"include": "#fenced_code_block_js"
@ -1058,7 +1058,7 @@
}
]
},
"fenced_code_block_jade": {
"fenced_code_block_pug": {
"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(jade|pug)(\\s+[^`~]*)?$)",
"name": "markup.fenced_code.block.markdown",
"end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$",
@ -1082,10 +1082,10 @@
{
"begin": "(^|\\G)(\\s*)(.*)",
"while": "(^|\\G)(?!\\s*([`~]{3,})\\s*$)",
"contentName": "meta.embedded.block.jade",
"contentName": "meta.embedded.block.pug",
"patterns": [
{
"include": "text.jade"
"include": "text.pug"
}
]
}

23
extensions/pug/OSSREADME.json
View File

@ -1,25 +1,8 @@
// ATTENTION - THIS DIRECTORY CONTAINS THIRD PARTY OPEN SOURCE MATERIALS:
[{
"name": "davidrios/jade-tmbundle",
"name": "davidrios/pug-tmbundle",
"version": "0.0.0",
"license": "MIT",
"repositoryURL": "https://github.com/davidrios/jade-tmbundle",
"description": "The file syntaxes/Jade.json was derived from Jade.tmLanguage in https://github.com/davidrios/jade-tmbundle.",
"licenseDetail": [
"The MIT License (MIT)",
"",
"Copyright (c) 2014 David Rios",
"",
"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"
]
"repositoryURL": "https://github.com/davidrios/pug-tmbundle",
"description": "The file syntaxes/pug.tmLanguage.json was derived from Syntaxes/Pug.JSON-tmLanguage in https://github.com/davidrios/pug-tmbundle."
}]

8
extensions/pug/package.json
View File

@ -6,18 +6,18 @@
"publisher": "vscode",
"engines": { "vscode": "*" },
"scripts": {
"update-grammar": "node ../../build/npm/update-grammar.js davidrios/jade-tmbundle Syntaxes/Jade.tmLanguage ./syntaxes/pug.tmLanguage.json"
"update-grammar": "node ../../build/npm/update-grammar.js davidrios/pug-tmbundle Syntaxes/Pug.JSON-tmLanguage ./syntaxes/pug.tmLanguage.json"
},
"contributes": {
"languages": [{
"id": "jade",
"id": "pug",
"extensions": [ ".jade", ".pug" ],
"aliases": [ "Pug", "Jade", "jade" ],
"configuration": "./language-configuration.json"
}],
"grammars": [{
"language": "jade",
"scopeName": "text.jade",
"language": "pug",
"scopeName": "text.pug",
"path": "./syntaxes/pug.tmLanguage.json"
}]
}

846
extensions/pug/syntaxes/pug.tmLanguage.json
View File

File diff suppressed because it is too large Load Diff

8
extensions/pug/test/colorize-results/test-4287_pug.json
View File

@ -1,7 +1,7 @@
[
{
"c": ".ssdsd",
"t": "text.jade entity.other.attribute-name.class.jade",
"t": "text.pug entity.other.attribute-name.class.pug",
"r": {
"dark_plus": "entity.other.attribute-name: #9CDCFE",
"light_plus": "entity.other.attribute-name: #FF0000",
@ -12,12 +12,12 @@
},
{
"c": " // asdsdas",
"t": "text.jade string.comment.buffered.block.jade",
"t": "text.pug string.comment.buffered.block.pug",
"r": {
"dark_plus": "string: #CE9178",
"light_plus": "string.comment.buffered.block.jade: #0000FF",
"light_plus": "string.comment.buffered.block.pug: #0000FF",
"dark_vs": "string: #CE9178",
"light_vs": "string.comment.buffered.block.jade: #0000FF",
"light_vs": "string.comment.buffered.block.pug: #0000FF",
"hc_black": "string: #CE9178"
}
}

410
extensions/pug/test/colorize-results/test_pug.json
View File

File diff suppressed because it is too large Load Diff

6
extensions/theme-defaults/themes/light_vs.json
View File

@ -216,9 +216,9 @@
},
{
"scope": [
"string.comment.buffered.block.jade",
"string.quoted.jade",
"string.interpolated.jade",
"string.comment.buffered.block.pug",
"string.quoted.pug",
"string.interpolated.pug",
"string.unquoted.plain.in.yaml",
"string.unquoted.plain.out.yaml",
"string.unquoted.block.yaml",

2
extensions/theme-seti/icons/vs-seti-icon-theme.json
View File

@ -1403,7 +1403,7 @@
"perl": "_perl",
"php": "_php",
"powershell": "_powershell",
"jade": "_jade",
"pug": "_jade",
"python": "_python",
"ruby": "_ruby",
"rust": "_rust",

12
src/vs/editor/standalone/common/themes.ts
View File

@ -34,8 +34,8 @@ export const vs: IStandaloneThemeData = {
{ token: 'delimiter.xml', foreground: '0000FF' },
{ token: 'tag', foreground: '800000' },
{ token: 'tag.id.jade', foreground: '4F76AC' },
{ token: 'tag.class.jade', foreground: '4F76AC' },
{ token: 'tag.id.pug', foreground: '4F76AC' },
{ token: 'tag.class.pug', foreground: '4F76AC' },
{ token: 'meta.scss', foreground: '800000' },
{ token: 'metatag', foreground: 'e00000' },
{ token: 'metatag.content.html', foreground: 'FF0000' },
@ -107,8 +107,8 @@ export const vs_dark: IStandaloneThemeData = {
{ token: 'delimiter.xml', foreground: '808080' },
{ token: 'tag', foreground: '569CD6' },
{ token: 'tag.id.jade', foreground: '4F76AC' },
{ token: 'tag.class.jade', foreground: '4F76AC' },
{ token: 'tag.id.pug', foreground: '4F76AC' },
{ token: 'tag.class.pug', foreground: '4F76AC' },
{ token: 'meta.scss', foreground: 'A79873' },
{ token: 'meta.tag', foreground: 'CE9178' },
{ token: 'metatag', foreground: 'DD6A6F' },
@ -176,8 +176,8 @@ export const hc_black: IStandaloneThemeData = {
{ token: 'delimiter.html', foreground: 'FFFF00' },
{ token: 'tag', foreground: '569CD6' },
{ token: 'tag.id.jade', foreground: '4F76AC' },
{ token: 'tag.class.jade', foreground: '4F76AC' },
{ token: 'tag.id.pug', foreground: '4F76AC' },
{ token: 'tag.class.pug', foreground: '4F76AC' },
{ token: 'meta', foreground: 'D4D4D4' },
{ token: 'meta.tag', foreground: 'CE9178' },
{ token: 'metatag', foreground: '569CD6' },