Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
68d09509
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,发现更多精彩内容 >>
提交
68d09509
编写于
3月 02, 2018
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Up/down in notifications should reset focus (fixes #44587)
上级
c8893033
变更
20
隐藏空白更改
内联
并排
Showing
20 changed file
with
69 addition
and
37 deletion
+69
-37
src/vs/base/browser/ui/list/listPaging.ts
src/vs/base/browser/ui/list/listPaging.ts
+4
-0
src/vs/base/parts/quickopen/browser/quickOpenWidget.ts
src/vs/base/parts/quickopen/browser/quickOpenWidget.ts
+3
-3
src/vs/base/parts/tree/browser/tree.ts
src/vs/base/parts/tree/browser/tree.ts
+2
-2
src/vs/base/parts/tree/browser/treeDefaults.ts
src/vs/base/parts/tree/browser/treeDefaults.ts
+2
-2
src/vs/base/parts/tree/browser/treeImpl.ts
src/vs/base/parts/tree/browser/treeImpl.ts
+2
-2
src/vs/editor/contrib/referenceSearch/referencesWidget.ts
src/vs/editor/contrib/referenceSearch/referencesWidget.ts
+1
-1
src/vs/workbench/browser/parts/views/customView.ts
src/vs/workbench/browser/parts/views/customView.ts
+2
-2
src/vs/workbench/browser/parts/views/viewsViewlet.ts
src/vs/workbench/browser/parts/views/viewsViewlet.ts
+1
-1
src/vs/workbench/browser/viewlet.ts
src/vs/workbench/browser/viewlet.ts
+1
-1
src/vs/workbench/electron-browser/commands.ts
src/vs/workbench/electron-browser/commands.ts
+29
-1
src/vs/workbench/parts/debug/browser/baseDebugView.ts
src/vs/workbench/parts/debug/browser/baseDebugView.ts
+2
-2
src/vs/workbench/parts/debug/electron-browser/debugHover.ts
src/vs/workbench/parts/debug/electron-browser/debugHover.ts
+1
-1
src/vs/workbench/parts/files/electron-browser/fileActions.ts
src/vs/workbench/parts/files/electron-browser/fileActions.ts
+4
-4
src/vs/workbench/parts/files/electron-browser/fileCommands.ts
...vs/workbench/parts/files/electron-browser/fileCommands.ts
+1
-1
src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
...kbench/parts/files/electron-browser/views/explorerView.ts
+3
-3
src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
...ench/parts/files/electron-browser/views/explorerViewer.ts
+3
-3
src/vs/workbench/parts/markers/browser/markersPanel.ts
src/vs/workbench/parts/markers/browser/markersPanel.ts
+1
-1
src/vs/workbench/parts/markers/browser/markersTreeController.ts
.../workbench/parts/markers/browser/markersTreeController.ts
+1
-1
src/vs/workbench/parts/search/browser/searchActions.ts
src/vs/workbench/parts/search/browser/searchActions.ts
+5
-5
src/vs/workbench/parts/search/browser/searchView.ts
src/vs/workbench/parts/search/browser/searchView.ts
+1
-1
未找到文件。
src/vs/base/browser/ui/list/listPaging.ts
浏览文件 @
68d09509
...
...
@@ -81,6 +81,10 @@ export class PagedList<T> implements IDisposable {
return
this
.
list
.
getHTMLElement
()
===
document
.
activeElement
;
}
domFocus
():
void
{
this
.
list
.
domFocus
();
}
get
onDidFocus
():
Event
<
void
>
{
return
this
.
list
.
onDidFocus
;
}
...
...
src/vs/base/parts/quickopen/browser/quickOpenWidget.ts
浏览文件 @
68d09509
...
...
@@ -447,7 +447,7 @@ export class QuickOpenWidget implements IModelProvider {
// Transition into quick navigate mode if not yet done
if
(
!
this
.
quickNavigateConfiguration
&&
quickNavigate
)
{
this
.
quickNavigateConfiguration
=
quickNavigate
;
this
.
tree
.
DOM
Focus
();
this
.
tree
.
dom
Focus
();
}
// Navigate
...
...
@@ -558,7 +558,7 @@ export class QuickOpenWidget implements IModelProvider {
if
(
this
.
quickNavigateConfiguration
)
{
this
.
inputContainer
.
hide
();
this
.
builder
.
show
();
this
.
tree
.
DOM
Focus
();
this
.
tree
.
dom
Focus
();
}
// Otherwise use normal UI
...
...
@@ -783,7 +783,7 @@ export class QuickOpenWidget implements IModelProvider {
// Clear Focus
if
(
this
.
tree
.
isDOMFocused
())
{
this
.
tree
.
DOM
Blur
();
this
.
tree
.
dom
Blur
();
}
else
if
(
this
.
inputBox
.
hasFocus
())
{
this
.
inputBox
.
blur
();
}
...
...
src/vs/base/parts/tree/browser/tree.ts
浏览文件 @
68d09509
...
...
@@ -60,7 +60,7 @@ export interface ITree {
/**
* Sets DOM focus on the tree.
*/
DOM
Focus
():
void
;
dom
Focus
():
void
;
/**
* Returns whether the tree has DOM focus.
...
...
@@ -70,7 +70,7 @@ export interface ITree {
/**
* Removes DOM focus from the tree.
*/
DOM
Blur
():
void
;
dom
Blur
():
void
;
/**
* Refreshes an element.
...
...
src/vs/base/parts/tree/browser/treeDefaults.ts
浏览文件 @
68d09509
...
...
@@ -172,7 +172,7 @@ export class DefaultController implements _.IController {
}
eventish
.
stopPropagation
();
tree
.
DOM
Focus
();
tree
.
dom
Focus
();
tree
.
setSelection
([
element
],
payload
);
tree
.
setFocus
(
element
,
payload
);
...
...
@@ -458,7 +458,7 @@ export class CollapseAllAction extends Action {
this
.
viewer
.
collapseAll
();
this
.
viewer
.
clearSelection
();
this
.
viewer
.
clearFocus
();
this
.
viewer
.
DOM
Focus
();
this
.
viewer
.
dom
Focus
();
this
.
viewer
.
focusFirst
();
return
TPromise
.
as
(
null
);
...
...
src/vs/base/parts/tree/browser/treeImpl.ts
浏览文件 @
68d09509
...
...
@@ -126,7 +126,7 @@ export class Tree implements _.ITree {
this
.
view
.
layout
(
height
);
}
public
DOM
Focus
():
void
{
public
dom
Focus
():
void
{
this
.
view
.
focus
();
}
...
...
@@ -134,7 +134,7 @@ export class Tree implements _.ITree {
return
this
.
view
.
isFocused
();
}
public
DOM
Blur
():
void
{
public
dom
Blur
():
void
{
this
.
view
.
blur
();
}
...
...
src/vs/editor/contrib/referenceSearch/referencesWidget.ts
浏览文件 @
68d09509
...
...
@@ -575,7 +575,7 @@ export class ReferenceWidget extends PeekViewWidget {
}
focus
():
void
{
this
.
_tree
.
DOM
Focus
();
this
.
_tree
.
dom
Focus
();
}
protected
_onTitleClick
(
e
:
MouseEvent
):
void
{
...
...
src/vs/workbench/browser/parts/views/customView.ts
浏览文件 @
68d09509
...
...
@@ -198,7 +198,7 @@ class CustomTreeViewer extends Disposable implements ITreeViewer {
}
// Pass Focus to Viewer
this
.
tree
.
DOM
Focus
();
this
.
tree
.
dom
Focus
();
}
}
...
...
@@ -541,7 +541,7 @@ class TreeController extends WorkbenchTreeController {
onHide
:
(
wasCancelled
?:
boolean
)
=>
{
if
(
wasCancelled
)
{
tree
.
DOM
Focus
();
tree
.
dom
Focus
();
}
},
...
...
src/vs/workbench/browser/parts/views/viewsViewlet.ts
浏览文件 @
68d09509
...
...
@@ -161,7 +161,7 @@ export abstract class TreeViewsViewletPanel extends ViewsViewletPanel {
}
// Pass Focus to Viewer
this
.
tree
.
DOM
Focus
();
this
.
tree
.
dom
Focus
();
}
dispose
():
void
{
...
...
src/vs/workbench/browser/viewlet.ts
浏览文件 @
68d09509
...
...
@@ -170,7 +170,7 @@ export class CollapseAction extends Action {
viewer
.
collapseAll
();
viewer
.
clearSelection
();
viewer
.
clearFocus
();
viewer
.
DOM
Focus
();
viewer
.
dom
Focus
();
viewer
.
focusFirst
();
return
TPromise
.
as
(
null
);
...
...
src/vs/workbench/electron-browser/commands.ts
浏览文件 @
68d09509
...
...
@@ -18,7 +18,7 @@ import { CommandsRegistry } from 'vs/platform/commands/common/commands';
import
{
IWorkbenchEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
URI
from
'
vs/base/common/uri
'
;
import
{
IEditorOptions
,
Position
as
EditorPosition
}
from
'
vs/platform/editor/common/editor
'
;
import
{
WorkbenchListFocusContextKey
,
IListService
,
WorkbenchListSupportsMultiSelectContextKey
}
from
'
vs/platform/list/browser/listService
'
;
import
{
WorkbenchListFocusContextKey
,
IListService
,
WorkbenchListSupportsMultiSelectContextKey
,
ListWidget
}
from
'
vs/platform/list/browser/listService
'
;
import
{
PagedList
}
from
'
vs/base/browser/ui/list/listPaging
'
;
import
{
range
}
from
'
vs/base/common/arrays
'
;
import
{
ContextKeyExpr
}
from
'
vs/platform/contextkey/common/contextkey
'
;
...
...
@@ -26,12 +26,25 @@ import { ITree } from 'vs/base/parts/tree/browser/tree';
// --- List Commands
function
ensureDOMFocus
(
widget
:
ListWidget
):
void
{
// it can happen that one of the commands is executed while
// DOM focus is within another focusable control within the
// list/tree item. therefor we should ensure that the
// list/tree has DOM focus again after the command ran.
if
(
widget
&&
!
widget
.
isDOMFocused
())
{
widget
.
domFocus
();
}
}
export
function
registerCommands
():
void
{
function
focusDown
(
accessor
:
ServicesAccessor
,
arg2
?:
number
):
void
{
const
focused
=
accessor
.
get
(
IListService
).
lastFocusedList
;
const
count
=
typeof
arg2
===
'
number
'
?
arg2
:
1
;
// Ensure DOM Focus
ensureDOMFocus
(
focused
);
// List
if
(
focused
instanceof
List
||
focused
instanceof
PagedList
)
{
const
list
=
focused
;
...
...
@@ -131,6 +144,9 @@ export function registerCommands(): void {
const
focused
=
accessor
.
get
(
IListService
).
lastFocusedList
;
const
count
=
typeof
arg2
===
'
number
'
?
arg2
:
1
;
// Ensure DOM Focus
ensureDOMFocus
(
focused
);
// List
if
(
focused
instanceof
List
||
focused
instanceof
PagedList
)
{
const
list
=
focused
;
...
...
@@ -261,6 +277,9 @@ export function registerCommands(): void {
handler
:
(
accessor
)
=>
{
const
focused
=
accessor
.
get
(
IListService
).
lastFocusedList
;
// Ensure DOM Focus
ensureDOMFocus
(
focused
);
// List
if
(
focused
instanceof
List
||
focused
instanceof
PagedList
)
{
const
list
=
focused
;
...
...
@@ -287,6 +306,9 @@ export function registerCommands(): void {
handler
:
(
accessor
)
=>
{
const
focused
=
accessor
.
get
(
IListService
).
lastFocusedList
;
// Ensure DOM Focus
ensureDOMFocus
(
focused
);
// List
if
(
focused
instanceof
List
||
focused
instanceof
PagedList
)
{
const
list
=
focused
;
...
...
@@ -324,6 +346,9 @@ export function registerCommands(): void {
function
listFocusFirst
(
accessor
:
ServicesAccessor
,
options
?:
{
fromFocused
:
boolean
}):
void
{
const
focused
=
accessor
.
get
(
IListService
).
lastFocusedList
;
// Ensure DOM Focus
ensureDOMFocus
(
focused
);
// List
if
(
focused
instanceof
List
||
focused
instanceof
PagedList
)
{
const
list
=
focused
;
...
...
@@ -360,6 +385,9 @@ export function registerCommands(): void {
function
listFocusLast
(
accessor
:
ServicesAccessor
,
options
?:
{
fromFocused
:
boolean
}):
void
{
const
focused
=
accessor
.
get
(
IListService
).
lastFocusedList
;
// Ensure DOM Focus
ensureDOMFocus
(
focused
);
// List
if
(
focused
instanceof
List
||
focused
instanceof
PagedList
)
{
const
list
=
focused
;
...
...
src/vs/workbench/parts/debug/browser/baseDebugView.ts
浏览文件 @
68d09509
...
...
@@ -165,7 +165,7 @@ export function renderRenameBox(debugService: IDebugService, contextViewService:
}
}
tree
.
DOM
Focus
();
tree
.
dom
Focus
();
tree
.
setFocus
(
element
);
// need to remove the input box since this template will be reused.
...
...
@@ -229,7 +229,7 @@ export class BaseDebugController extends WorkbenchTreeController {
}),
onHide
:
(
wasCancelled
?:
boolean
)
=>
{
if
(
wasCancelled
)
{
tree
.
DOM
Focus
();
tree
.
dom
Focus
();
}
},
getActionsContext
:
()
=>
element
...
...
src/vs/workbench/parts/debug/electron-browser/debugHover.ts
浏览文件 @
68d09509
...
...
@@ -281,7 +281,7 @@ export class DebugHoverWidget implements IContentWidget {
this
.
scrollbar
.
scanDomNode
();
if
(
focus
)
{
this
.
editor
.
render
();
this
.
tree
.
DOM
Focus
();
this
.
tree
.
dom
Focus
();
}
});
}
...
...
src/vs/workbench/parts/files/electron-browser/fileActions.ts
浏览文件 @
68d09509
...
...
@@ -698,7 +698,7 @@ class BaseDeleteFileAction extends BaseFileAction {
return
this
.
choiceService
.
choose
(
Severity
.
Error
,
toErrorMessage
(
error
,
false
),
choices
,
choices
.
length
-
1
,
true
).
then
(
choice
=>
{
// Focus back to tree
this
.
tree
.
DOM
Focus
();
this
.
tree
.
dom
Focus
();
if
(
this
.
useTrash
)
{
...
...
@@ -878,7 +878,7 @@ class CopyFileAction extends BaseFileAction {
this
.
tree
.
clearHighlight
();
}
this
.
tree
.
DOM
Focus
();
this
.
tree
.
dom
Focus
();
return
TPromise
.
as
(
null
);
}
...
...
@@ -942,7 +942,7 @@ class PasteFileAction extends BaseFileAction {
return
void
0
;
},
error
=>
this
.
onError
(
error
)).
then
(()
=>
{
this
.
tree
.
DOM
Focus
();
this
.
tree
.
dom
Focus
();
});
},
error
=>
{
this
.
onError
(
new
Error
(
nls
.
localize
(
'
fileDeleted
'
,
"
File to paste was deleted or moved meanwhile
"
)));
...
...
@@ -1221,7 +1221,7 @@ export class FocusFilesExplorer extends Action {
const
view
=
viewlet
.
getExplorerView
();
if
(
view
)
{
view
.
setExpanded
(
true
);
view
.
getViewer
().
DOM
Focus
();
view
.
getViewer
().
dom
Focus
();
}
});
}
...
...
src/vs/workbench/parts/files/electron-browser/fileCommands.ts
浏览文件 @
68d09509
...
...
@@ -340,7 +340,7 @@ CommandsRegistry.registerCommand({
// Remove highlight
if
(
tree
instanceof
Tree
)
{
tree
.
clearHighlight
();
tree
.
DOM
Focus
();
tree
.
dom
Focus
();
}
globalResourceToCompare
=
getResourceForCommand
(
resource
,
listService
,
accessor
.
get
(
IWorkbenchEditorService
));
...
...
src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
浏览文件 @
68d09509
...
...
@@ -299,7 +299,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
}
// Pass Focus to Viewer
this
.
explorerViewer
.
DOM
Focus
();
this
.
explorerViewer
.
dom
Focus
();
keepFocus
=
true
;
}
...
...
@@ -580,7 +580,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
// Ensure viewer has keyboard focus if event originates from viewer
if
(
restoreFocus
)
{
this
.
explorerViewer
.
DOM
Focus
();
this
.
explorerViewer
.
dom
Focus
();
}
},
errors
.
onUnexpectedError
);
}
...
...
@@ -729,7 +729,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
}
// Focus
this
.
explorerViewer
.
DOM
Focus
();
this
.
explorerViewer
.
dom
Focus
();
// Find resource to focus from active editor input if set
let
resourceToFocus
:
URI
;
...
...
src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
浏览文件 @
68d09509
...
...
@@ -294,7 +294,7 @@ export class FileRenderer implements IRenderer {
setTimeout
(()
=>
{
if
(
!
blur
)
{
// https://github.com/Microsoft/vscode/issues/20269
tree
.
DOM
Focus
();
tree
.
dom
Focus
();
}
lifecycle
.
dispose
(
toDispose
);
container
.
removeChild
(
label
.
element
);
...
...
@@ -408,7 +408,7 @@ export class FileController extends WorkbenchTreeController implements IDisposab
event
.
stopPropagation
();
// Set DOM focus
tree
.
DOM
Focus
();
tree
.
dom
Focus
();
if
(
stat
instanceof
NewStatPlaceholder
)
{
return
true
;
}
...
...
@@ -497,7 +497,7 @@ export class FileController extends WorkbenchTreeController implements IDisposab
},
onHide
:
(
wasCancelled
?:
boolean
)
=>
{
if
(
wasCancelled
)
{
tree
.
DOM
Focus
();
tree
.
dom
Focus
();
}
},
getActionsContext
:
()
=>
selection
&&
selection
.
indexOf
(
stat
)
>=
0
...
...
src/vs/workbench/parts/markers/browser/markersPanel.ts
浏览文件 @
68d09509
...
...
@@ -101,7 +101,7 @@ export class MarkersPanel extends Panel {
}
if
(
this
.
markersWorkbenchService
.
markersModel
.
hasFilteredResources
())
{
this
.
tree
.
DOM
Focus
();
this
.
tree
.
dom
Focus
();
if
(
this
.
tree
.
getSelection
().
length
===
0
)
{
this
.
tree
.
focusFirst
();
}
...
...
src/vs/workbench/parts/markers/browser/markersTreeController.ts
浏览文件 @
68d09509
...
...
@@ -66,7 +66,7 @@ export class Controller extends WorkbenchTreeController {
onHide
:
(
wasCancelled
?:
boolean
)
=>
{
if
(
wasCancelled
)
{
tree
.
DOM
Focus
();
tree
.
dom
Focus
();
}
}
});
...
...
src/vs/workbench/parts/search/browser/searchActions.ts
浏览文件 @
68d09509
...
...
@@ -377,7 +377,7 @@ export class CollapseDeepestExpandedLevelAction extends Action {
viewer
.
collapseDeepestExpandedLevel
();
viewer
.
clearSelection
();
viewer
.
clearFocus
();
viewer
.
DOM
Focus
();
viewer
.
dom
Focus
();
viewer
.
focusFirst
();
}
return
TPromise
.
as
(
null
);
...
...
@@ -548,7 +548,7 @@ export class RemoveAction extends AbstractSearchAndReplaceAction {
elementToRefresh
=
parent
.
count
()
===
0
?
parent
.
parent
()
:
parent
;
}
this
.
viewer
.
DOM
Focus
();
this
.
viewer
.
dom
Focus
();
return
this
.
viewer
.
refresh
(
elementToRefresh
);
}
...
...
@@ -567,7 +567,7 @@ export class ReplaceAllAction extends AbstractSearchAndReplaceAction {
if
(
nextFocusElement
)
{
this
.
viewer
.
setFocus
(
nextFocusElement
);
}
this
.
viewer
.
DOM
Focus
();
this
.
viewer
.
dom
Focus
();
this
.
viewlet
.
open
(
this
.
fileMatch
,
true
);
});
}
...
...
@@ -588,7 +588,7 @@ export class ReplaceAllInFolderAction extends AbstractSearchAndReplaceAction {
if
(
nextFocusElement
)
{
this
.
viewer
.
setFocus
(
nextFocusElement
);
}
this
.
viewer
.
DOM
Focus
();
this
.
viewer
.
dom
Focus
();
}
}
...
...
@@ -610,7 +610,7 @@ export class ReplaceAction extends AbstractSearchAndReplaceAction {
this
.
viewer
.
setFocus
(
elementToFocus
);
}
let
elementToShowReplacePreview
=
this
.
getElementToShowReplacePreview
(
elementToFocus
);
this
.
viewer
.
DOM
Focus
();
this
.
viewer
.
dom
Focus
();
if
(
!
elementToShowReplacePreview
||
this
.
hasToOpenFile
())
{
this
.
viewlet
.
open
(
this
.
element
,
true
);
}
else
{
...
...
src/vs/workbench/parts/search/browser/searchView.ts
浏览文件 @
68d09509
...
...
@@ -827,7 +827,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
private
selectTreeIfNotSelected
():
void
{
if
(
this
.
tree
.
getInput
())
{
this
.
tree
.
DOM
Focus
();
this
.
tree
.
dom
Focus
();
let
selection
=
this
.
tree
.
getSelection
();
if
(
selection
.
length
===
0
)
{
this
.
tree
.
focusNext
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录