Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
75494028
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,发现更多精彩内容 >>
提交
75494028
编写于
8月 23, 2017
作者:
D
Daniel Imms
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'origin/master' into tyriar/electron-1.7.3
上级
e16484a3
611e6984
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
31 addition
and
17 deletion
+31
-17
extensions/typescript/package.json
extensions/typescript/package.json
+14
-7
extensions/typescript/src/features/codeActionProvider.ts
extensions/typescript/src/features/codeActionProvider.ts
+16
-10
src/vs/editor/contrib/colorPicker/browser/colorPickerWidget.ts
...s/editor/contrib/colorPicker/browser/colorPickerWidget.ts
+1
-0
未找到文件。
extensions/typescript/package.json
浏览文件 @
75494028
...
...
@@ -92,12 +92,14 @@
"null"
],
"default"
:
null
,
"description"
:
"%typescript.tsdk.desc%"
"description"
:
"%typescript.tsdk.desc%"
,
"scope"
:
"window"
},
"typescript.disableAutomaticTypeAcquisition"
:
{
"type"
:
"boolean"
,
"default"
:
false
,
"description"
:
"%typescript.disableAutomaticTypeAcquisition%"
"description"
:
"%typescript.disableAutomaticTypeAcquisition%"
,
"scope"
:
"window"
},
"typescript.npm"
:
{
"type"
:
[
...
...
@@ -106,12 +108,14 @@
],
"default"
:
null
,
"description"
:
"%typescript.npm%"
,
"isExecutable"
:
true
"isExecutable"
:
true
,
"scope"
:
"window"
},
"typescript.check.npmIsInstalled"
:
{
"type"
:
"boolean"
,
"default"
:
true
,
"description"
:
"%typescript.check.npmIsInstalled%"
"description"
:
"%typescript.check.npmIsInstalled%"
,
"scope"
:
"window"
},
"javascript.referencesCodeLens.enabled"
:
{
"type"
:
"boolean"
,
...
...
@@ -327,7 +331,8 @@
"javascript.implicitProjectConfig.checkJs"
:
{
"type"
:
"boolean"
,
"default"
:
false
,
"description"
:
"%javascript.implicitProjectConfig.checkJs%"
"description"
:
"%javascript.implicitProjectConfig.checkJs%"
,
"scope"
:
"window"
},
"javascript.nameSuggestions"
:
{
"type"
:
"boolean"
,
...
...
@@ -461,7 +466,9 @@
"taskDefinitions"
:
[
{
"type"
:
"typescript"
,
"required"
:
[
"tsconfig"
],
"required"
:
[
"tsconfig"
],
"properties"
:
{
"tsconfig"
:
{
"type"
:
"string"
,
...
...
@@ -515,4 +522,4 @@
}
]
}
}
\ No newline at end of file
}
extensions/typescript/src/features/codeActionProvider.ts
浏览文件 @
75494028
...
...
@@ -32,7 +32,12 @@ export default class TypeScriptCodeActionProvider implements CodeActionProvider
commands
.
registerCommand
(
this
.
commandId
,
this
.
onCodeAction
,
this
);
}
public
async
provideCodeActions
(
document
:
TextDocument
,
range
:
Range
,
context
:
CodeActionContext
,
token
:
CancellationToken
):
Promise
<
Command
[]
>
{
public
async
provideCodeActions
(
document
:
TextDocument
,
range
:
Range
,
context
:
CodeActionContext
,
token
:
CancellationToken
):
Promise
<
Command
[]
>
{
if
(
!
this
.
client
.
apiVersion
.
has213Features
())
{
return
[];
}
...
...
@@ -70,7 +75,7 @@ export default class TypeScriptCodeActionProvider implements CodeActionProvider
errorCodes
:
Array
.
from
(
supportedActions
)
};
const
response
=
await
this
.
client
.
execute
(
'
getCodeFixes
'
,
args
,
token
);
return
(
response
.
body
||
[]).
map
(
action
=>
this
.
actionToEdit
(
source
,
action
));
return
(
response
.
body
||
[]).
map
(
action
=>
this
.
getCommandForAction
(
source
,
action
));
}
private
get
supportedCodeActions
():
Thenable
<
NumberSet
>
{
...
...
@@ -94,7 +99,15 @@ export default class TypeScriptCodeActionProvider implements CodeActionProvider
.
filter
(
code
=>
supportedActions
[
code
])));
}
private
actionToEdit
(
source
:
Source
,
action
:
Proto
.
CodeAction
):
Command
{
private
getCommandForAction
(
source
:
Source
,
action
:
Proto
.
CodeAction
):
Command
{
return
{
title
:
action
.
description
,
command
:
this
.
commandId
,
arguments
:
[
source
,
action
]
};
}
private
async
onCodeAction
(
source
:
Source
,
action
:
Proto
.
CodeAction
):
Promise
<
boolean
>
{
const
workspaceEdit
=
new
WorkspaceEdit
();
for
(
const
change
of
action
.
changes
)
{
for
(
const
textChange
of
change
.
textChanges
)
{
...
...
@@ -105,14 +118,7 @@ export default class TypeScriptCodeActionProvider implements CodeActionProvider
textChange
.
newText
);
}
}
return
{
title
:
action
.
description
,
command
:
this
.
commandId
,
arguments
:
[
source
,
workspaceEdit
]
};
}
private
async
onCodeAction
(
source
:
Source
,
workspaceEdit
:
WorkspaceEdit
):
Promise
<
boolean
>
{
const
success
=
workspace
.
applyEdit
(
workspaceEdit
);
if
(
!
success
)
{
return
false
;
...
...
src/vs/editor/contrib/colorPicker/browser/colorPickerWidget.ts
浏览文件 @
75494028
...
...
@@ -180,6 +180,7 @@ class SaturationBox extends Disposable {
const
whiteGradient
=
ctx
.
createLinearGradient
(
0
,
0
,
this
.
canvas
.
width
,
0
);
whiteGradient
.
addColorStop
(
0
,
'
rgba(255, 255, 255, 1)
'
);
whiteGradient
.
addColorStop
(
0.5
,
'
rgba(255, 255, 255, 0.5)
'
);
whiteGradient
.
addColorStop
(
1
,
'
rgba(255, 255, 255, 0)
'
);
const
blackGradient
=
ctx
.
createLinearGradient
(
0
,
0
,
0
,
this
.
canvas
.
height
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录