Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
1ab17da0
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,发现更多精彩内容 >>
提交
1ab17da0
编写于
2月 23, 2016
作者:
B
Brad Gashler
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
https://github.com/Microsoft/vscode
上级
50edb728
43f95cca
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
81 addition
and
57 deletion
+81
-57
build/gulpfile.vscode.js
build/gulpfile.vscode.js
+3
-10
src/vs/base/browser/ui/list/listWidget.ts
src/vs/base/browser/ui/list/listWidget.ts
+22
-42
src/vs/base/common/event.ts
src/vs/base/common/event.ts
+51
-0
src/vs/workbench/electron-main/cli.ts
src/vs/workbench/electron-main/cli.ts
+5
-5
未找到文件。
build/gulpfile.vscode.js
浏览文件 @
1ab17da0
...
...
@@ -294,14 +294,9 @@ function prepareDebPackage(arch) {
function
buildDebPackage
(
arch
)
{
var
debArch
=
getDebPackageArch
(
arch
);
return
shell
.
task
([
'
fakeroot dpkg-deb -b vscode-
'
+
debArch
,
'
dpkg-scanpackages . /dev/null > Packages
'
],
{
cwd
:
'
.build/linux/
'
+
debArch
});
}
function
buildDebPackageCatalog
(
arch
)
{
var
debArch
=
getDebPackageArch
(
arch
);
return
shell
.
task
([],
{
cwd
:
'
.build/linux/
'
+
debArch
});
'
fakeroot dpkg-deb -b
'
+
debArch
+
'
/vscode-
'
+
debArch
,
'
dpkg-scanpackages
'
+
debArch
+
'
/dev/null >
'
+
debArch
+
'
/Packages
'
],
{
cwd
:
'
.build/linux
'
});
}
gulp
.
task
(
'
clean-vscode-win32
'
,
util
.
rimraf
(
path
.
join
(
path
.
dirname
(
root
),
'
VSCode-win32
'
)));
...
...
@@ -328,8 +323,6 @@ gulp.task('vscode-linux-ia32-prepare-deb', ['clean-vscode-linux-ia32-deb', 'vsco
gulp
.
task
(
'
vscode-linux-x64-prepare-deb
'
,
[
'
clean-vscode-linux-x64-deb
'
,
'
vscode-linux-x64-min
'
],
prepareDebPackage
(
'
x64
'
));
gulp
.
task
(
'
vscode-linux-ia32-build-deb
'
,
[
'
vscode-linux-ia32-prepare-deb
'
],
buildDebPackage
(
'
ia32
'
));
gulp
.
task
(
'
vscode-linux-x64-build-deb
'
,
[
'
vscode-linux-x64-prepare-deb
'
],
buildDebPackage
(
'
x64
'
));
gulp
.
task
(
'
vscode-linux-ia32-build-deb-catalog
'
,
[
'
vscode-linux-ia32-build-deb
'
],
buildDebPackageCatalog
(
'
ia32
'
));
gulp
.
task
(
'
vscode-linux-x64-build-deb-catalog
'
,
[
'
vscode-linux-x64-build-deb
'
],
buildDebPackageCatalog
(
'
x64
'
));
// Sourcemaps
...
...
src/vs/base/browser/ui/list/listWidget.ts
浏览文件 @
1ab17da0
...
...
@@ -7,7 +7,7 @@ import 'vs/css!./list';
import
{
IDisposable
,
dispose
,
disposeAll
}
from
'
vs/base/common/lifecycle
'
;
import
{
isNumber
}
from
'
vs/base/common/types
'
;
import
*
as
DOM
from
'
vs/base/browser/dom
'
;
import
Event
,
{
Emitter
,
mapEvent
}
from
'
vs/base/common/event
'
;
import
Event
,
{
Emitter
,
mapEvent
,
EventDelayer
}
from
'
vs/base/common/event
'
;
import
{
IDelegate
,
IRenderer
,
IListMouseEvent
,
IFocusChangeEvent
,
ISelectionChangeEvent
}
from
'
./list
'
;
import
{
ListView
}
from
'
./listView
'
;
...
...
@@ -89,36 +89,10 @@ class Trait implements IDisposable {
return
this
.
indexes
;
}
add
(
index
:
number
):
void
{
if
(
this
.
contains
(
index
))
{
return
;
}
this
.
indexes
.
push
(
index
);
this
.
_onChange
.
fire
({
indexes
:
this
.
indexes
});
}
remove
(
index
:
number
):
void
{
this
.
indexes
=
this
.
indexes
.
filter
(
i
=>
i
===
index
);
this
.
_onChange
.
fire
({
indexes
:
this
.
indexes
});
}
contains
(
index
:
number
):
boolean
{
return
this
.
indexes
.
some
(
i
=>
i
===
index
);
}
next
(
n
:
number
):
void
{
let
index
=
this
.
indexes
.
length
?
this
.
indexes
[
0
]
:
0
;
index
=
Math
.
min
(
index
+
n
,
this
.
indexes
.
length
);
this
.
set
(
index
);
}
previous
(
n
:
number
):
void
{
let
index
=
this
.
indexes
.
length
?
this
.
indexes
[
0
]
:
this
.
indexes
.
length
-
1
;
index
=
Math
.
max
(
index
-
n
,
0
);
this
.
set
(
index
);
}
wrapRenderer
<
T
,
D
>
(
renderer
:
IRenderer
<
T
,
D
>
):
IRenderer
<
T
,
ITraitTemplateData
<
D
>>
{
return
new
TraitRenderer
<
T
,
D
>
(
this
,
renderer
);
}
...
...
@@ -154,21 +128,16 @@ export class List<T> implements IDisposable {
private
focus
:
Trait
;
private
selection
:
Trait
;
private
eventDelayer
:
EventDelayer
;
private
view
:
ListView
<
T
>
;
private
controller
:
Controller
<
T
>
;
get
onFocusChange
():
Event
<
IFocusChangeEvent
<
T
>>
{
return
mapEvent
(
this
.
focus
.
onChange
,
e
=>
({
elements
:
e
.
indexes
.
map
(
i
=>
this
.
view
.
element
(
i
)),
indexes
:
e
.
indexes
}));
return
this
.
eventDelayer
.
delay
(
mapEvent
(
this
.
focus
.
onChange
,
e
=>
this
.
toListEvent
(
e
)));
}
get
onSelectionChange
():
Event
<
ISelectionChangeEvent
<
T
>>
{
return
mapEvent
(
this
.
selection
.
onChange
,
e
=>
({
elements
:
e
.
indexes
.
map
(
i
=>
this
.
view
.
element
(
i
)),
indexes
:
e
.
indexes
}));
return
this
.
eventDelayer
.
delay
(
mapEvent
(
this
.
selection
.
onChange
,
e
=>
this
.
toListEvent
(
e
)));
}
constructor
(
...
...
@@ -178,6 +147,7 @@ export class List<T> implements IDisposable {
)
{
this
.
focus
=
new
Trait
(
'
focused
'
);
this
.
selection
=
new
Trait
(
'
selected
'
);
this
.
eventDelayer
=
new
EventDelayer
();
renderers
=
renderers
.
map
(
r
=>
{
r
=
this
.
focus
.
wrapRenderer
(
r
);
...
...
@@ -190,9 +160,11 @@ export class List<T> implements IDisposable {
}
splice
(
start
:
number
,
deleteCount
:
number
,
...
elements
:
T
[]):
void
{
this
.
focus
.
splice
(
start
,
deleteCount
,
elements
.
length
);
this
.
selection
.
splice
(
start
,
deleteCount
,
elements
.
length
);
this
.
view
.
splice
(
start
,
deleteCount
,
...
elements
);
this
.
eventDelayer
.
wrap
(()
=>
{
this
.
focus
.
splice
(
start
,
deleteCount
,
elements
.
length
);
this
.
selection
.
splice
(
start
,
deleteCount
,
elements
.
length
);
this
.
view
.
splice
(
start
,
deleteCount
,
...
elements
);
});
}
get
length
():
number
{
...
...
@@ -208,8 +180,10 @@ export class List<T> implements IDisposable {
}
setSelection
(...
indexes
:
number
[]):
void
{
indexes
=
indexes
.
concat
(
this
.
selection
.
set
(...
indexes
));
indexes
.
forEach
(
i
=>
this
.
view
.
splice
(
i
,
1
,
this
.
view
.
element
(
i
)));
this
.
eventDelayer
.
wrap
(()
=>
{
indexes
=
indexes
.
concat
(
this
.
selection
.
set
(...
indexes
));
indexes
.
forEach
(
i
=>
this
.
view
.
splice
(
i
,
1
,
this
.
view
.
element
(
i
)));
});
}
selectNext
(
n
=
1
,
loop
=
false
):
void
{
...
...
@@ -230,8 +204,10 @@ export class List<T> implements IDisposable {
}
setFocus
(...
indexes
:
number
[]):
void
{
indexes
=
indexes
.
concat
(
this
.
focus
.
set
(...
indexes
));
indexes
.
forEach
(
i
=>
this
.
view
.
splice
(
i
,
1
,
this
.
view
.
element
(
i
)));
this
.
eventDelayer
.
wrap
(()
=>
{
indexes
=
indexes
.
concat
(
this
.
focus
.
set
(...
indexes
));
indexes
.
forEach
(
i
=>
this
.
view
.
splice
(
i
,
1
,
this
.
view
.
element
(
i
)));
});
}
focusNext
(
n
=
1
,
loop
=
false
):
void
{
...
...
@@ -322,6 +298,10 @@ export class List<T> implements IDisposable {
}
}
private
toListEvent
<
T
>
({
indexes
}:
ITraitChangeEvent
)
{
return
{
indexes
,
elements
:
indexes
.
map
(
i
=>
this
.
view
.
element
(
i
))
};
}
dispose
():
void
{
this
.
view
=
dispose
(
this
.
view
);
this
.
focus
=
dispose
(
this
.
focus
);
...
...
src/vs/base/common/event.ts
浏览文件 @
1ab17da0
...
...
@@ -154,4 +154,55 @@ export function fromEventEmitter<T>(emitter: EventEmitter, eventType: string): E
export
function
mapEvent
<
I
,
O
>
(
event
:
Event
<
I
>
,
map
:
(
i
:
I
)
=>
O
):
Event
<
O
>
{
return
(
listener
,
thisArgs
?,
disposables
?)
=>
event
(
i
=>
listener
(
map
(
i
)),
thisArgs
,
disposables
);
}
enum
EventDelayerState
{
Idle
,
Running
}
/**
* The EventDelayer is useful in situations in which you want
* to delay firing your events during some code.
* You can wrap that code and be sure that the event will not
* be fired during that wrap.
*
* ```
* const emitter: Emitter;
* const delayer = new EventDelayer();
* const delayedEvent = delayer.delay(emitter.event);
*
* delayedEvent(console.log);
*
* delayer.wrap(() => {
* emitter.fire(); // event will not be fired yet
* });
*
* // event will only be fired at this point
* ```
*/
export
class
EventDelayer
{
private
state
=
EventDelayerState
.
Idle
;
private
buffer
:
Function
[]
=
[];
delay
<
T
>
(
event
:
Event
<
T
>
):
Event
<
T
>
{
return
(
listener
,
thisArgs
?,
disposables
?)
=>
{
return
event
(
i
=>
{
if
(
this
.
state
===
EventDelayerState
.
Idle
)
{
listener
(
i
);
}
else
{
this
.
buffer
.
push
(()
=>
listener
(
i
));
}
},
thisArgs
,
disposables
);
};
}
wrap
(
fn
:
()
=>
void
):
void
{
this
.
state
=
EventDelayerState
.
Running
;
fn
();
this
.
buffer
.
forEach
(
flush
=>
flush
());
this
.
buffer
=
[];
this
.
state
=
EventDelayerState
.
Idle
;
}
}
\ No newline at end of file
src/vs/workbench/electron-main/cli.ts
浏览文件 @
1ab17da0
...
...
@@ -24,16 +24,16 @@ class ArgParser {
help
():
string
{
const
executable
=
'
code
'
+
(
os
.
platform
()
===
'
win32
'
?
'
.exe
'
:
''
);
const
indent
=
'
'
;
return
`Visual Studio Code v
${
packageJson
.
version
}
Usage:
${
executable
}
[arguments] [paths...]
Options:
-h, --help Print usage.
--locale Use a specific locale.
-n Force a new instance of Code.
-v, --version Print version.`
;
${
indent
}
-h, --help Print usage.
${
indent
}
--locale Use a specific locale.
${
indent
}
-n Force a new instance of Code.
${
indent
}
-v, --version Print version.`
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录