Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
a2e04eaf
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,发现更多精彩内容 >>
提交
a2e04eaf
编写于
4月 05, 2017
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix dependency issue
上级
8bb7104c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
173 addition
and
144 deletion
+173
-144
src/vs/editor/browser/editor.all.ts
src/vs/editor/browser/editor.all.ts
+1
-1
src/vs/editor/contrib/quickFix/browser/quickFix.ts
src/vs/editor/contrib/quickFix/browser/quickFix.ts
+2
-143
src/vs/editor/contrib/quickFix/browser/quickFixCommands.ts
src/vs/editor/contrib/quickFix/browser/quickFixCommands.ts
+170
-0
未找到文件。
src/vs/editor/browser/editor.all.ts
浏览文件 @
a2e04eaf
...
...
@@ -32,7 +32,7 @@ import 'vs/editor/contrib/links/browser/links';
import
'
vs/editor/contrib/multicursor/common/multicursor
'
;
import
'
vs/editor/contrib/multicursor/browser/menuPreventer
'
;
import
'
vs/editor/contrib/parameterHints/browser/parameterHints
'
;
import
'
vs/editor/contrib/quickFix/browser/quickFix
'
;
import
'
vs/editor/contrib/quickFix/browser/quickFix
Commands
'
;
import
'
vs/editor/contrib/referenceSearch/browser/referenceSearch
'
;
import
'
vs/editor/contrib/rename/browser/rename
'
;
import
'
vs/editor/contrib/smartSelect/common/smartSelect
'
;
...
...
src/vs/editor/contrib/quickFix/browser/quickFix.ts
浏览文件 @
a2e04eaf
...
...
@@ -4,139 +4,12 @@
*--------------------------------------------------------------------------------------------*/
'
use strict
'
;
import
*
as
nls
from
'
vs/nls
'
;
import
URI
from
'
vs/base/common/uri
'
;
import
{
IDisposable
,
dispose
}
from
'
vs/base/common/lifecycle
'
;
import
{
KeyCode
,
KeyMod
}
from
'
vs/base/common/keyCodes
'
;
import
{
ICommandService
}
from
'
vs/platform/commands/common/commands
'
;
import
{
IContextMenuService
}
from
'
vs/platform/contextview/browser/contextView
'
;
import
{
ContextKeyExpr
,
IContextKeyService
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
IKeybindingService
}
from
'
vs/platform/keybinding/common/keybinding
'
;
import
{
IMarkerService
}
from
'
vs/platform/markers/common/markers
'
;
import
{
IModelService
}
from
'
vs/editor/common/services/modelService
'
;
import
{
ICommonCodeEditor
,
EditorContextKeys
,
ModeContextKeys
,
IEditorContribution
,
IReadOnlyModel
}
from
'
vs/editor/common/editorCommon
'
;
import
{
IReadOnlyModel
}
from
'
vs/editor/common/editorCommon
'
;
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
import
{
editorAction
,
ServicesAccessor
,
EditorAction
,
CommonEditorRegistry
}
from
'
vs/editor/common/editorCommonExtensions
'
;
import
{
ICodeEditor
}
from
'
vs/editor/browser/editorBrowser
'
;
import
{
editorContribution
}
from
'
vs/editor/browser/editorBrowserExtensions
'
;
import
{
CodeAction
,
CodeActionProviderRegistry
}
from
'
vs/editor/common/modes
'
;
import
{
asWinJsPromise
}
from
'
vs/base/common/async
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
onUnexpectedExternalError
,
illegalArgument
}
from
'
vs/base/common/errors
'
;
import
{
QuickFixContextMenu
}
from
'
./quickFixWidget
'
;
import
{
LightBulbWidget
}
from
'
./lightBulbWidget
'
;
import
{
QuickFixModel
,
QuickFixComputeEvent
}
from
'
./quickFixModel
'
;
@
editorContribution
export
class
QuickFixController
implements
IEditorContribution
{
private
static
ID
=
'
editor.contrib.quickFixController
'
;
public
static
get
(
editor
:
ICommonCodeEditor
):
QuickFixController
{
return
editor
.
getContribution
<
QuickFixController
>
(
QuickFixController
.
ID
);
}
private
_editor
:
ICodeEditor
;
private
_model
:
QuickFixModel
;
private
_quickFixContextMenu
:
QuickFixContextMenu
;
private
_lightBulbWidget
:
LightBulbWidget
;
private
_disposables
:
IDisposable
[]
=
[];
constructor
(
editor
:
ICodeEditor
,
@
IMarkerService
markerService
:
IMarkerService
,
@
IContextKeyService
contextKeyService
:
IContextKeyService
,
@
ICommandService
commandService
:
ICommandService
,
@
IContextMenuService
contextMenuService
:
IContextMenuService
,
@
IKeybindingService
private
_keybindingService
:
IKeybindingService
)
{
this
.
_editor
=
editor
;
this
.
_model
=
new
QuickFixModel
(
this
.
_editor
,
markerService
);
this
.
_quickFixContextMenu
=
new
QuickFixContextMenu
(
editor
,
contextMenuService
,
commandService
);
this
.
_lightBulbWidget
=
new
LightBulbWidget
(
editor
);
this
.
_updateLightBulbTitle
();
this
.
_disposables
.
push
(
this
.
_quickFixContextMenu
.
onDidExecuteCodeAction
(
_
=>
this
.
_model
.
trigger
(
'
auto
'
)),
this
.
_lightBulbWidget
.
onClick
(
this
.
_handleLightBulbSelect
,
this
),
this
.
_model
.
onDidChangeFixes
(
e
=>
this
.
_onQuickFixEvent
(
e
)),
this
.
_keybindingService
.
onDidUpdateKeybindings
(
this
.
_updateLightBulbTitle
,
this
)
);
}
public
dispose
():
void
{
this
.
_model
.
dispose
();
dispose
(
this
.
_disposables
);
}
private
_onQuickFixEvent
(
e
:
QuickFixComputeEvent
):
void
{
if
(
e
&&
e
.
type
===
'
manual
'
)
{
this
.
_quickFixContextMenu
.
show
(
e
.
fixes
,
e
.
position
);
}
else
if
(
e
&&
e
.
fixes
)
{
// auto magically triggered
// * update an existing list of code actions
// * manage light bulb
if
(
this
.
_quickFixContextMenu
.
isVisible
)
{
this
.
_quickFixContextMenu
.
show
(
e
.
fixes
,
e
.
position
);
}
else
{
this
.
_lightBulbWidget
.
model
=
e
;
}
}
else
{
this
.
_lightBulbWidget
.
hide
();
}
}
public
getId
():
string
{
return
QuickFixController
.
ID
;
}
private
_handleLightBulbSelect
(
coords
:
{
x
:
number
,
y
:
number
}):
void
{
this
.
_quickFixContextMenu
.
show
(
this
.
_lightBulbWidget
.
model
.
fixes
,
coords
);
}
public
triggerFromEditorSelection
():
void
{
this
.
_model
.
trigger
(
'
manual
'
);
}
private
_updateLightBulbTitle
():
void
{
const
kb
=
this
.
_keybindingService
.
lookupKeybinding
(
QuickFixAction
.
Id
);
let
title
:
string
;
if
(
kb
)
{
title
=
nls
.
localize
(
'
quickFixWithKb
'
,
"
Show Fixes ({0})
"
,
kb
.
getLabel
());
}
else
{
title
=
nls
.
localize
(
'
quickFix
'
,
"
Show Fixes
"
);
}
this
.
_lightBulbWidget
.
title
=
title
;
}
}
@
editorAction
export
class
QuickFixAction
extends
EditorAction
{
static
Id
=
'
editor.action.quickFix
'
;
constructor
()
{
super
({
id
:
QuickFixAction
.
Id
,
label
:
nls
.
localize
(
'
quickfix.trigger.label
'
,
"
Quick Fix
"
),
alias
:
'
Quick Fix
'
,
precondition
:
ContextKeyExpr
.
and
(
EditorContextKeys
.
Writable
,
ModeContextKeys
.
hasCodeActionsProvider
),
kbOpts
:
{
kbExpr
:
EditorContextKeys
.
TextFocus
,
primary
:
KeyMod
.
CtrlCmd
|
KeyCode
.
US_DOT
}
});
}
public
run
(
accessor
:
ServicesAccessor
,
editor
:
ICommonCodeEditor
):
void
{
let
controller
=
QuickFixController
.
get
(
editor
);
if
(
controller
)
{
controller
.
triggerFromEditorSelection
();
}
}
}
import
{
onUnexpectedExternalError
}
from
'
vs/base/common/errors
'
;
export
function
getCodeActions
(
model
:
IReadOnlyModel
,
range
:
Range
):
TPromise
<
CodeAction
[]
>
{
...
...
@@ -154,17 +27,3 @@ export function getCodeActions(model: IReadOnlyModel, range: Range): TPromise<Co
return
TPromise
.
join
(
promises
).
then
(()
=>
allResults
);
}
CommonEditorRegistry
.
registerLanguageCommand
(
'
_executeCodeActionProvider
'
,
function
(
accessor
,
args
)
{
const
{
resource
,
range
}
=
args
;
if
(
!
(
resource
instanceof
URI
)
||
!
Range
.
isIRange
(
range
))
{
throw
illegalArgument
();
}
const
model
=
accessor
.
get
(
IModelService
).
getModel
(
resource
);
if
(
!
model
)
{
throw
illegalArgument
();
}
return
getCodeActions
(
model
,
model
.
validateRange
(
range
));
});
src/vs/editor/contrib/quickFix/browser/quickFixCommands.ts
0 → 100644
浏览文件 @
a2e04eaf
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
'
use strict
'
;
import
*
as
nls
from
'
vs/nls
'
;
import
URI
from
'
vs/base/common/uri
'
;
import
{
IDisposable
,
dispose
}
from
'
vs/base/common/lifecycle
'
;
import
{
KeyCode
,
KeyMod
}
from
'
vs/base/common/keyCodes
'
;
import
{
ICommandService
}
from
'
vs/platform/commands/common/commands
'
;
import
{
IContextMenuService
}
from
'
vs/platform/contextview/browser/contextView
'
;
import
{
ContextKeyExpr
,
IContextKeyService
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
IKeybindingService
}
from
'
vs/platform/keybinding/common/keybinding
'
;
import
{
IMarkerService
}
from
'
vs/platform/markers/common/markers
'
;
import
{
IModelService
}
from
'
vs/editor/common/services/modelService
'
;
import
{
ICommonCodeEditor
,
EditorContextKeys
,
ModeContextKeys
,
IEditorContribution
,
IReadOnlyModel
}
from
'
vs/editor/common/editorCommon
'
;
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
import
{
editorAction
,
ServicesAccessor
,
EditorAction
,
CommonEditorRegistry
}
from
'
vs/editor/common/editorCommonExtensions
'
;
import
{
ICodeEditor
}
from
'
vs/editor/browser/editorBrowser
'
;
import
{
editorContribution
}
from
'
vs/editor/browser/editorBrowserExtensions
'
;
import
{
CodeAction
,
CodeActionProviderRegistry
}
from
'
vs/editor/common/modes
'
;
import
{
asWinJsPromise
}
from
'
vs/base/common/async
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
onUnexpectedExternalError
,
illegalArgument
}
from
'
vs/base/common/errors
'
;
import
{
QuickFixContextMenu
}
from
'
./quickFixWidget
'
;
import
{
LightBulbWidget
}
from
'
./lightBulbWidget
'
;
import
{
QuickFixModel
,
QuickFixComputeEvent
}
from
'
./quickFixModel
'
;
@
editorContribution
export
class
QuickFixController
implements
IEditorContribution
{
private
static
ID
=
'
editor.contrib.quickFixController
'
;
public
static
get
(
editor
:
ICommonCodeEditor
):
QuickFixController
{
return
editor
.
getContribution
<
QuickFixController
>
(
QuickFixController
.
ID
);
}
private
_editor
:
ICodeEditor
;
private
_model
:
QuickFixModel
;
private
_quickFixContextMenu
:
QuickFixContextMenu
;
private
_lightBulbWidget
:
LightBulbWidget
;
private
_disposables
:
IDisposable
[]
=
[];
constructor
(
editor
:
ICodeEditor
,
@
IMarkerService
markerService
:
IMarkerService
,
@
IContextKeyService
contextKeyService
:
IContextKeyService
,
@
ICommandService
commandService
:
ICommandService
,
@
IContextMenuService
contextMenuService
:
IContextMenuService
,
@
IKeybindingService
private
_keybindingService
:
IKeybindingService
)
{
this
.
_editor
=
editor
;
this
.
_model
=
new
QuickFixModel
(
this
.
_editor
,
markerService
);
this
.
_quickFixContextMenu
=
new
QuickFixContextMenu
(
editor
,
contextMenuService
,
commandService
);
this
.
_lightBulbWidget
=
new
LightBulbWidget
(
editor
);
this
.
_updateLightBulbTitle
();
this
.
_disposables
.
push
(
this
.
_quickFixContextMenu
.
onDidExecuteCodeAction
(
_
=>
this
.
_model
.
trigger
(
'
auto
'
)),
this
.
_lightBulbWidget
.
onClick
(
this
.
_handleLightBulbSelect
,
this
),
this
.
_model
.
onDidChangeFixes
(
e
=>
this
.
_onQuickFixEvent
(
e
)),
this
.
_keybindingService
.
onDidUpdateKeybindings
(
this
.
_updateLightBulbTitle
,
this
)
);
}
public
dispose
():
void
{
this
.
_model
.
dispose
();
dispose
(
this
.
_disposables
);
}
private
_onQuickFixEvent
(
e
:
QuickFixComputeEvent
):
void
{
if
(
e
&&
e
.
type
===
'
manual
'
)
{
this
.
_quickFixContextMenu
.
show
(
e
.
fixes
,
e
.
position
);
}
else
if
(
e
&&
e
.
fixes
)
{
// auto magically triggered
// * update an existing list of code actions
// * manage light bulb
if
(
this
.
_quickFixContextMenu
.
isVisible
)
{
this
.
_quickFixContextMenu
.
show
(
e
.
fixes
,
e
.
position
);
}
else
{
this
.
_lightBulbWidget
.
model
=
e
;
}
}
else
{
this
.
_lightBulbWidget
.
hide
();
}
}
public
getId
():
string
{
return
QuickFixController
.
ID
;
}
private
_handleLightBulbSelect
(
coords
:
{
x
:
number
,
y
:
number
}):
void
{
this
.
_quickFixContextMenu
.
show
(
this
.
_lightBulbWidget
.
model
.
fixes
,
coords
);
}
public
triggerFromEditorSelection
():
void
{
this
.
_model
.
trigger
(
'
manual
'
);
}
private
_updateLightBulbTitle
():
void
{
const
kb
=
this
.
_keybindingService
.
lookupKeybinding
(
QuickFixAction
.
Id
);
let
title
:
string
;
if
(
kb
)
{
title
=
nls
.
localize
(
'
quickFixWithKb
'
,
"
Show Fixes ({0})
"
,
kb
.
getLabel
());
}
else
{
title
=
nls
.
localize
(
'
quickFix
'
,
"
Show Fixes
"
);
}
this
.
_lightBulbWidget
.
title
=
title
;
}
}
@
editorAction
export
class
QuickFixAction
extends
EditorAction
{
static
Id
=
'
editor.action.quickFix
'
;
constructor
()
{
super
({
id
:
QuickFixAction
.
Id
,
label
:
nls
.
localize
(
'
quickfix.trigger.label
'
,
"
Quick Fix
"
),
alias
:
'
Quick Fix
'
,
precondition
:
ContextKeyExpr
.
and
(
EditorContextKeys
.
Writable
,
ModeContextKeys
.
hasCodeActionsProvider
),
kbOpts
:
{
kbExpr
:
EditorContextKeys
.
TextFocus
,
primary
:
KeyMod
.
CtrlCmd
|
KeyCode
.
US_DOT
}
});
}
public
run
(
accessor
:
ServicesAccessor
,
editor
:
ICommonCodeEditor
):
void
{
let
controller
=
QuickFixController
.
get
(
editor
);
if
(
controller
)
{
controller
.
triggerFromEditorSelection
();
}
}
}
export
function
getCodeActions
(
model
:
IReadOnlyModel
,
range
:
Range
):
TPromise
<
CodeAction
[]
>
{
const
allResults
:
CodeAction
[]
=
[];
const
promises
=
CodeActionProviderRegistry
.
all
(
model
).
map
(
support
=>
{
return
asWinJsPromise
(
token
=>
support
.
provideCodeActions
(
model
,
range
,
token
)).
then
(
result
=>
{
if
(
Array
.
isArray
(
result
))
{
allResults
.
push
(...
result
);
}
},
err
=>
{
onUnexpectedExternalError
(
err
);
});
});
return
TPromise
.
join
(
promises
).
then
(()
=>
allResults
);
}
CommonEditorRegistry
.
registerLanguageCommand
(
'
_executeCodeActionProvider
'
,
function
(
accessor
,
args
)
{
const
{
resource
,
range
}
=
args
;
if
(
!
(
resource
instanceof
URI
)
||
!
Range
.
isIRange
(
range
))
{
throw
illegalArgument
();
}
const
model
=
accessor
.
get
(
IModelService
).
getModel
(
resource
);
if
(
!
model
)
{
throw
illegalArgument
();
}
return
getCodeActions
(
model
,
model
.
validateRange
(
range
));
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录