Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
509d693a
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
509d693a
编写于
1月 03, 2019
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #65649 - fix injection patching in update-grammar.js
上级
b2ac8d2d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
14 addition
and
15 deletion
+14
-15
extensions/php/build/update-grammar.js
extensions/php/build/update-grammar.js
+7
-8
extensions/php/syntaxes/html.tmLanguage.json
extensions/php/syntaxes/html.tmLanguage.json
+7
-7
未找到文件。
extensions/php/build/update-grammar.js
浏览文件 @
509d693a
...
...
@@ -4,17 +4,17 @@
*--------------------------------------------------------------------------------------------*/
'
use strict
'
;
var
updateGrammar
=
require
(
'
../../../build/npm/update-grammar
'
);
const
updateGrammar
=
require
(
'
../../../build/npm/update-grammar
'
);
function
adaptInjectionScope
(
grammar
)
{
// we're using the HTML grammar from https://github.com/textmate/html.tmbundle which has moved away from source.js.embedded.html
let
oldInjectionKey
=
"
text.html.php - (meta.embedded | meta.tag), L:text.html.php meta.tag, L:source.js.embedded.html
"
;
let
newInjectionKey
=
"
text.html.php - (meta.embedded | meta.tag), L:text.html.php meta.tag, L:text.html.php source.js
"
;
const
oldInjectionKey
=
"
text.html.php - (meta.embedded | meta.tag), L:((text.html.php meta.tag) - (meta.embedded.block.php | meta.embedded.line.php)), L:(source.js.embedded.html - (meta.embedded.block.php | meta.embedded.line.php))
"
;
const
newInjectionKey
=
"
text.html.php - (meta.embedded | meta.tag), L:((text.html.php meta.tag) - (meta.embedded.block.php | meta.embedded.line.php)), L:(source.js - (meta.embedded.block.php | meta.embedded.line.php))
"
;
var
injections
=
grammar
.
injections
;
var
injection
=
injections
[
oldInjectionKey
];
if
(
!
injection
s
)
{
throw
new
Error
(
"
Can not find PHP injection
"
);
const
injections
=
grammar
.
injections
;
const
injection
=
injections
[
oldInjectionKey
];
if
(
!
injection
)
{
throw
new
Error
(
"
Can not find PHP injection
to patch
"
);
}
delete
injections
[
oldInjectionKey
];
injections
[
newInjectionKey
]
=
injection
;
...
...
@@ -37,4 +37,3 @@ 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
);
extensions/php/syntaxes/html.tmLanguage.json
浏览文件 @
509d693a
...
...
@@ -8,13 +8,6 @@
"name"
:
"PHP"
,
"scopeName"
:
"text.html.php"
,
"injections"
:
{
"text.html.php - (meta.embedded | meta.tag), L:((text.html.php meta.tag) - (meta.embedded.block.php | meta.embedded.line.php)), L:(source.js.embedded.html - (meta.embedded.block.php | meta.embedded.line.php))"
:
{
"patterns"
:
[
{
"include"
:
"#php-tag"
}
]
},
"L:source.php string.quoted.single.sql.php source.sql.embedded.php"
:
{
"patterns"
:
[
{
...
...
@@ -115,6 +108,13 @@
"include"
:
"source.php#interpolation_double_quoted"
}
]
},
"text.html.php - (meta.embedded | meta.tag), L:((text.html.php meta.tag) - (meta.embedded.block.php | meta.embedded.line.php)), L:(source.js - (meta.embedded.block.php | meta.embedded.line.php))"
:
{
"patterns"
:
[
{
"include"
:
"#php-tag"
}
]
}
},
"patterns"
:
[
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录