Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
3e1276cb
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
3e1276cb
编写于
10月 14, 2019
作者:
R
Rob Lourens
提交者:
GitHub
10月 14, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #82377 from microsoft/fix/php-custom-tags
php - fix custom tags appearing invalid
上级
ecdba243
f8403849
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
82 addition
and
2 deletion
+82
-2
extensions/php/build/update-grammar.js
extensions/php/build/update-grammar.js
+12
-1
extensions/php/syntaxes/html.tmLanguage.json
extensions/php/syntaxes/html.tmLanguage.json
+1
-1
extensions/php/test/colorize-fixtures/issue-76997.php
extensions/php/test/colorize-fixtures/issue-76997.php
+1
-0
extensions/php/test/colorize-results/issue-76997_php.json
extensions/php/test/colorize-results/issue-76997_php.json
+68
-0
未找到文件。
extensions/php/build/update-grammar.js
浏览文件 @
3e1276cb
...
...
@@ -21,6 +21,14 @@ function adaptInjectionScope(grammar) {
injections
[
newInjectionKey
]
=
injection
;
}
function
includeDerivativeHtml
(
grammar
)
{
grammar
.
patterns
.
forEach
(
pattern
=>
{
if
(
pattern
.
include
===
'
text.html.basic
'
)
{
pattern
.
include
=
'
text.html.derivative
'
;
}
});
}
// Workaround for https://github.com/Microsoft/vscode/issues/40279
// and https://github.com/Microsoft/vscode-textmate/issues/59
function
fixBadRegex
(
grammar
)
{
...
...
@@ -61,4 +69,7 @@ function fixBadRegex(grammar) {
}
updateGrammar
.
update
(
'
atom/language-php
'
,
'
grammars/php.cson
'
,
'
./syntaxes/php.tmLanguage.json
'
,
fixBadRegex
);
updateGrammar
.
update
(
'
atom/language-php
'
,
'
grammars/html.cson
'
,
'
./syntaxes/html.tmLanguage.json
'
,
adaptInjectionScope
);
updateGrammar
.
update
(
'
atom/language-php
'
,
'
grammars/html.cson
'
,
'
./syntaxes/html.tmLanguage.json
'
,
grammar
=>
{
adaptInjectionScope
(
grammar
);
includeDerivativeHtml
(
grammar
);
});
extensions/php/syntaxes/html.tmLanguage.json
浏览文件 @
3e1276cb
...
...
@@ -129,7 +129,7 @@
"name"
:
"comment.line.shebang.php"
},
{
"include"
:
"text.html.
basic
"
"include"
:
"text.html.
derivative
"
}
],
"repository"
:
{
...
...
extensions/php/test/colorize-fixtures/issue-76997.php
0 → 100644
浏览文件 @
3e1276cb
<hello></hello>
extensions/php/test/colorize-results/issue-76997_php.json
0 → 100644
浏览文件 @
3e1276cb
[
{
"c"
:
"<"
,
"t"
:
"text.html.php meta.tag.other.unrecognized.html.derivative punctuation.definition.tag.begin.html"
,
"r"
:
{
"dark_plus"
:
"punctuation.definition.tag: #808080"
,
"light_plus"
:
"punctuation.definition.tag: #800000"
,
"dark_vs"
:
"punctuation.definition.tag: #808080"
,
"light_vs"
:
"punctuation.definition.tag: #800000"
,
"hc_black"
:
"punctuation.definition.tag: #808080"
}
},
{
"c"
:
"hello"
,
"t"
:
"text.html.php meta.tag.other.unrecognized.html.derivative entity.name.tag.html"
,
"r"
:
{
"dark_plus"
:
"entity.name.tag: #569CD6"
,
"light_plus"
:
"entity.name.tag: #800000"
,
"dark_vs"
:
"entity.name.tag: #569CD6"
,
"light_vs"
:
"entity.name.tag: #800000"
,
"hc_black"
:
"entity.name.tag: #569CD6"
}
},
{
"c"
:
">"
,
"t"
:
"text.html.php meta.tag.other.unrecognized.html.derivative punctuation.definition.tag.end.html"
,
"r"
:
{
"dark_plus"
:
"punctuation.definition.tag: #808080"
,
"light_plus"
:
"punctuation.definition.tag: #800000"
,
"dark_vs"
:
"punctuation.definition.tag: #808080"
,
"light_vs"
:
"punctuation.definition.tag: #800000"
,
"hc_black"
:
"punctuation.definition.tag: #808080"
}
},
{
"c"
:
"</"
,
"t"
:
"text.html.php meta.tag.other.unrecognized.html.derivative punctuation.definition.tag.begin.html"
,
"r"
:
{
"dark_plus"
:
"punctuation.definition.tag: #808080"
,
"light_plus"
:
"punctuation.definition.tag: #800000"
,
"dark_vs"
:
"punctuation.definition.tag: #808080"
,
"light_vs"
:
"punctuation.definition.tag: #800000"
,
"hc_black"
:
"punctuation.definition.tag: #808080"
}
},
{
"c"
:
"hello"
,
"t"
:
"text.html.php meta.tag.other.unrecognized.html.derivative entity.name.tag.html"
,
"r"
:
{
"dark_plus"
:
"entity.name.tag: #569CD6"
,
"light_plus"
:
"entity.name.tag: #800000"
,
"dark_vs"
:
"entity.name.tag: #569CD6"
,
"light_vs"
:
"entity.name.tag: #800000"
,
"hc_black"
:
"entity.name.tag: #569CD6"
}
},
{
"c"
:
">"
,
"t"
:
"text.html.php meta.tag.other.unrecognized.html.derivative punctuation.definition.tag.end.html"
,
"r"
:
{
"dark_plus"
:
"punctuation.definition.tag: #808080"
,
"light_plus"
:
"punctuation.definition.tag: #800000"
,
"dark_vs"
:
"punctuation.definition.tag: #808080"
,
"light_vs"
:
"punctuation.definition.tag: #800000"
,
"hc_black"
:
"punctuation.definition.tag: #808080"
}
}
]
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录