Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
a1dc5ba4
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,发现更多精彩内容 >>
未验证
提交
a1dc5ba4
编写于
8月 09, 2019
作者:
J
Johannes Rieken
提交者:
GitHub
8月 09, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' into joh/extHostInject
上级
481d9552
6d0e6aa0
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
23 addition
and
27 deletion
+23
-27
src/main.js
src/main.js
+2
-2
src/tsconfig.base.json
src/tsconfig.base.json
+1
-2
src/vs/base/browser/ui/iconLabel/iconLabel.ts
src/vs/base/browser/ui/iconLabel/iconLabel.ts
+3
-3
src/vs/base/parts/quickopen/browser/quickOpenModel.ts
src/vs/base/parts/quickopen/browser/quickOpenModel.ts
+1
-1
src/vs/editor/contrib/suggest/suggestWidget.ts
src/vs/editor/contrib/suggest/suggestWidget.ts
+1
-1
src/vs/workbench/browser/actions/listCommands.ts
src/vs/workbench/browser/actions/listCommands.ts
+6
-15
src/vs/workbench/browser/parts/editor/editorPart.ts
src/vs/workbench/browser/parts/editor/editorPart.ts
+3
-0
src/vs/workbench/browser/parts/quickinput/quickInputList.ts
src/vs/workbench/browser/parts/quickinput/quickInputList.ts
+1
-1
src/vs/workbench/browser/parts/views/customView.ts
src/vs/workbench/browser/parts/views/customView.ts
+1
-1
src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
...s/workbench/contrib/files/browser/views/explorerViewer.ts
+1
-1
src/vs/workbench/services/editor/test/browser/editorGroupsService.test.ts
.../services/editor/test/browser/editorGroupsService.test.ts
+3
-0
未找到文件。
src/main.js
浏览文件 @
a1dc5ba4
...
...
@@ -133,7 +133,7 @@ function onReady() {
}
/**
* @typedef
{import('minimist').ParsedArgs
} ParsedArgs
* @typedef
{{ [arg: string]: any; '--'?: string[]; _: string[]; }
} ParsedArgs
*
* @param {ParsedArgs} cliArgs
*/
...
...
@@ -186,7 +186,7 @@ function getUserDataPath(cliArgs) {
* @returns {ParsedArgs}
*/
function
parseCLIArgs
()
{
const
minimist
=
require
(
'
minimist
'
);
const
minimist
=
require
(
'
vscode-
minimist
'
);
return
minimist
(
process
.
argv
,
{
string
:
[
...
...
src/tsconfig.base.json
浏览文件 @
a1dc5ba4
...
...
@@ -20,11 +20,10 @@
},
"types"
:
[
"keytar"
,
"minimist"
,
"mocha"
,
"semver"
,
"sinon"
,
"winreg"
]
}
}
\ No newline at end of file
}
src/vs/base/browser/ui/iconLabel/iconLabel.ts
浏览文件 @
a1dc5ba4
...
...
@@ -12,7 +12,7 @@ import { Disposable } from 'vs/base/common/lifecycle';
export
interface
IIconLabelCreationOptions
{
supportHighlights
?:
boolean
;
supportDescriptionHighlights
?:
boolean
;
donotS
upportOcticons
?:
boolean
;
s
upportOcticons
?:
boolean
;
}
export
interface
IIconLabelValueOptions
{
...
...
@@ -100,13 +100,13 @@ export class IconLabel extends Disposable {
this
.
labelDescriptionContainer
=
this
.
_register
(
new
FastLabelNode
(
dom
.
append
(
this
.
domNode
.
element
,
dom
.
$
(
'
.monaco-icon-label-description-container
'
))));
if
(
options
&&
options
.
supportHighlights
)
{
this
.
labelNode
=
new
HighlightedLabel
(
dom
.
append
(
this
.
labelDescriptionContainer
.
element
,
dom
.
$
(
'
a.label-name
'
)),
!
options
.
donotS
upportOcticons
);
this
.
labelNode
=
new
HighlightedLabel
(
dom
.
append
(
this
.
labelDescriptionContainer
.
element
,
dom
.
$
(
'
a.label-name
'
)),
!
!
options
.
s
upportOcticons
);
}
else
{
this
.
labelNode
=
this
.
_register
(
new
FastLabelNode
(
dom
.
append
(
this
.
labelDescriptionContainer
.
element
,
dom
.
$
(
'
a.label-name
'
))));
}
if
(
options
&&
options
.
supportDescriptionHighlights
)
{
this
.
descriptionNodeFactory
=
()
=>
new
HighlightedLabel
(
dom
.
append
(
this
.
labelDescriptionContainer
.
element
,
dom
.
$
(
'
span.label-description
'
)),
!
options
.
donotS
upportOcticons
);
this
.
descriptionNodeFactory
=
()
=>
new
HighlightedLabel
(
dom
.
append
(
this
.
labelDescriptionContainer
.
element
,
dom
.
$
(
'
span.label-description
'
)),
!
!
options
.
s
upportOcticons
);
}
else
{
this
.
descriptionNodeFactory
=
()
=>
this
.
_register
(
new
FastLabelNode
(
dom
.
append
(
this
.
labelDescriptionContainer
.
element
,
dom
.
$
(
'
span.label-description
'
))));
}
...
...
src/vs/base/parts/quickopen/browser/quickOpenModel.ts
浏览文件 @
a1dc5ba4
...
...
@@ -352,7 +352,7 @@ class Renderer implements IRenderer<QuickOpenEntry> {
row1
.
appendChild
(
icon
);
// Label
const
label
=
new
IconLabel
(
row1
,
{
supportHighlights
:
true
,
supportDescriptionHighlights
:
true
});
const
label
=
new
IconLabel
(
row1
,
{
supportHighlights
:
true
,
supportDescriptionHighlights
:
true
,
supportOcticons
:
true
});
// Keybinding
const
keybindingContainer
=
document
.
createElement
(
'
span
'
);
...
...
src/vs/editor/contrib/suggest/suggestWidget.ts
浏览文件 @
a1dc5ba4
...
...
@@ -115,7 +115,7 @@ class Renderer implements IListRenderer<CompletionItem, ISuggestionTemplateData>
const
text
=
append
(
container
,
$
(
'
.contents
'
));
const
main
=
append
(
text
,
$
(
'
.main
'
));
data
.
iconLabel
=
new
IconLabel
(
main
,
{
supportHighlights
:
true
});
data
.
iconLabel
=
new
IconLabel
(
main
,
{
supportHighlights
:
true
,
supportOcticons
:
true
});
data
.
disposables
.
add
(
data
.
iconLabel
);
data
.
typeLabel
=
append
(
main
,
$
(
'
span.type-label
'
));
...
...
src/vs/workbench/browser/actions/listCommands.ts
浏览文件 @
a1dc5ba4
...
...
@@ -749,11 +749,8 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
if
(
focused
instanceof
List
||
focused
instanceof
PagedList
)
{
const
list
=
focused
;
if
(
list
.
getSelection
().
length
>
0
)
{
list
.
setSelection
([]);
}
else
if
(
list
.
getFocus
().
length
>
0
)
{
list
.
setFocus
([]);
}
list
.
setSelection
([]);
list
.
setFocus
([]);
}
// ObjectTree
...
...
@@ -761,22 +758,16 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
const
list
=
focused
;
const
fakeKeyboardEvent
=
new
KeyboardEvent
(
'
keydown
'
);
if
(
list
.
getSelection
().
length
>
0
)
{
list
.
setSelection
([],
fakeKeyboardEvent
);
}
else
if
(
list
.
getFocus
().
length
>
0
)
{
list
.
setFocus
([],
fakeKeyboardEvent
);
}
list
.
setSelection
([],
fakeKeyboardEvent
);
list
.
setFocus
([],
fakeKeyboardEvent
);
}
// Tree
else
if
(
focused
)
{
const
tree
=
focused
;
if
(
tree
.
getSelection
().
length
)
{
tree
.
clearSelection
({
origin
:
'
keyboard
'
});
}
else
if
(
tree
.
getFocus
())
{
tree
.
clearFocus
({
origin
:
'
keyboard
'
});
}
tree
.
clearSelection
({
origin
:
'
keyboard
'
});
tree
.
clearFocus
({
origin
:
'
keyboard
'
});
}
}
});
...
...
src/vs/workbench/browser/parts/editor/editorPart.ts
浏览文件 @
a1dc5ba4
...
...
@@ -821,6 +821,9 @@ export class EditorPart extends Part implements IEditorGroupsService, IEditorGro
// Update container
this
.
updateContainer
();
// Notify group index change we created the entire grid
this
.
notifyGroupIndexChange
();
}
private
doCreateGridControlWithPreviousState
():
boolean
{
...
...
src/vs/workbench/browser/parts/quickinput/quickInputList.ts
浏览文件 @
a1dc5ba4
...
...
@@ -114,7 +114,7 @@ class ListElementRenderer implements IListRenderer<ListElement, IListElementTemp
const
row2
=
dom
.
append
(
rows
,
$
(
'
.quick-input-list-row
'
));
// Label
data
.
label
=
new
IconLabel
(
row1
,
{
supportHighlights
:
true
,
supportDescriptionHighlights
:
true
});
data
.
label
=
new
IconLabel
(
row1
,
{
supportHighlights
:
true
,
supportDescriptionHighlights
:
true
,
supportOcticons
:
true
});
// Detail
const
detailContainer
=
dom
.
append
(
row2
,
$
(
'
.quick-input-list-label-meta
'
));
...
...
src/vs/workbench/browser/parts/views/customView.ts
浏览文件 @
a1dc5ba4
...
...
@@ -726,7 +726,7 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
const
icon
=
DOM
.
append
(
container
,
DOM
.
$
(
'
.custom-view-tree-node-item-icon
'
));
const
resourceLabel
=
this
.
labels
.
create
(
container
,
{
supportHighlights
:
true
,
donotSupportOcticons
:
true
});
const
resourceLabel
=
this
.
labels
.
create
(
container
,
{
supportHighlights
:
true
});
const
actionsContainer
=
DOM
.
append
(
resourceLabel
.
element
,
DOM
.
$
(
'
.actions
'
));
const
actionBar
=
new
ActionBar
(
actionsContainer
,
{
actionViewItemProvider
:
this
.
actionViewItemProvider
...
...
src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
浏览文件 @
a1dc5ba4
...
...
@@ -141,7 +141,7 @@ export class FilesRenderer implements ITreeRenderer<ExplorerItem, FuzzyScore, IF
renderTemplate
(
container
:
HTMLElement
):
IFileTemplateData
{
const
elementDisposable
=
Disposable
.
None
;
const
label
=
this
.
labels
.
create
(
container
,
{
supportHighlights
:
true
,
donotSupportOcticons
:
true
});
const
label
=
this
.
labels
.
create
(
container
,
{
supportHighlights
:
true
});
return
{
elementDisposable
,
label
,
container
};
}
...
...
src/vs/workbench/services/editor/test/browser/editorGroupsService.test.ts
浏览文件 @
a1dc5ba4
...
...
@@ -196,8 +196,11 @@ suite('EditorGroupsService', () => {
const
gridOrder
=
part
.
getGroups
(
GroupsOrder
.
GRID_APPEARANCE
);
assert
.
equal
(
gridOrder
.
length
,
3
);
assert
.
equal
(
gridOrder
[
0
],
rootGroup
);
assert
.
equal
(
gridOrder
[
0
].
index
,
0
);
assert
.
equal
(
gridOrder
[
1
],
rightGroup
);
assert
.
equal
(
gridOrder
[
1
].
index
,
1
);
assert
.
equal
(
gridOrder
[
2
],
downGroup
);
assert
.
equal
(
gridOrder
[
2
].
index
,
2
);
part
.
moveGroup
(
downGroup
,
rightGroup
,
GroupDirection
.
DOWN
);
assert
.
equal
(
groupMovedCounter
,
1
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录