Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
11fb2c13
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,发现更多精彩内容 >>
提交
11fb2c13
编写于
12月 13, 2018
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove winjs-promise - fixes #53526
上级
a99079f1
变更
11
展开全部
隐藏空白更改
内联
并排
Showing
11 changed file
with
38 addition
and
2315 deletion
+38
-2315
.vscode/launch.json
.vscode/launch.json
+12
-14
build/gulpfile.hygiene.js
build/gulpfile.hygiene.js
+0
-2
src/tsconfig.strictNullChecks.json
src/tsconfig.strictNullChecks.json
+0
-1
src/vs/base/common/buildunit.json
src/vs/base/common/buildunit.json
+6
-5
src/vs/base/common/winjs.base.d.ts
src/vs/base/common/winjs.base.d.ts
+0
-53
src/vs/base/common/winjs.base.js
src/vs/base/common/winjs.base.js
+0
-2096
src/vs/base/test/common/async.test.ts
src/vs/base/test/common/async.test.ts
+0
-55
src/vs/base/test/common/winjs.promise.test.ts
src/vs/base/test/common/winjs.promise.test.ts
+0
-68
src/vs/platform/extensionManagement/node/extensionManagementService.ts
...rm/extensionManagement/node/extensionManagementService.ts
+1
-2
test/all.js
test/all.js
+18
-18
test/electron/renderer.js
test/electron/renderer.js
+1
-1
未找到文件。
.vscode/launch.json
浏览文件 @
11fb2c13
...
...
@@ -133,24 +133,22 @@
},
"urlFilter"
:
"*workbench.html*"
,
"runtimeArgs"
:
[
"--inspect=5875"
,
"--no-cached-data"
],
"skipFiles"
:
[
"**/winjs*.js"
"--inspect=5875"
,
"--no-cached-data"
],
"webRoot"
:
"${workspaceFolder}"
},
{
"type"
:
"node"
,
"request"
:
"launch"
,
"name"
:
"Launch VS Code (Main Process)"
,
"runtimeExecutable"
:
"${workspaceFolder}/scripts/code.sh"
,
"runtimeArgs"
:
[
"--no-cached-data"
],
"outFiles"
:
[
"${workspaceFolder}/out/**/*.js"
]
"type"
:
"node"
,
"request"
:
"launch"
,
"name"
:
"Launch VS Code (Main Process)"
,
"runtimeExecutable"
:
"${workspaceFolder}/scripts/code.sh"
,
"runtimeArgs"
:
[
"--no-cached-data"
],
"outFiles"
:
[
"${workspaceFolder}/out/**/*.js"
]
},
{
"type"
:
"node"
,
...
...
build/gulpfile.hygiene.js
浏览文件 @
11fb2c13
...
...
@@ -50,7 +50,6 @@ const indentationFilter = [
'
!src/vs/css.build.js
'
,
'
!src/vs/loader.js
'
,
'
!src/vs/base/common/marked/marked.js
'
,
'
!src/vs/base/common/winjs.base.js
'
,
'
!src/vs/base/node/terminateProcess.sh
'
,
'
!src/vs/base/node/cpuUsage.sh
'
,
'
!test/assert.js
'
,
...
...
@@ -128,7 +127,6 @@ const eslintFilter = [
'
!src/vs/nls.js
'
,
'
!src/vs/css.build.js
'
,
'
!src/vs/nls.build.js
'
,
'
!src/**/winjs.base.js
'
,
'
!src/**/marked.js
'
,
'
!**/test/**
'
];
...
...
src/tsconfig.strictNullChecks.json
浏览文件 @
11fb2c13
...
...
@@ -136,7 +136,6 @@
"./vs/base/test/common/types.test.ts"
,
"./vs/base/test/common/utils.ts"
,
"./vs/base/test/common/uuid.test.ts"
,
"./vs/base/test/common/winjs.promise.test.ts"
,
"./vs/base/test/node/console.test.ts"
,
"./vs/base/test/node/decoder.test.ts"
,
"./vs/base/test/node/encoding/encoding.test.ts"
,
...
...
src/vs/base/common/buildunit.json
浏览文件 @
11fb2c13
{
"name"
:
"vs/base"
,
"dependencies"
:
[
{
"name"
:
"vs"
,
"internal"
:
false
}
{
"name"
:
"vs"
,
"internal"
:
false
}
],
"libs"
:
[
"lib.core.d.ts"
...
...
@@ -9,7 +12,5 @@
"sources"
:
[
"**/*.ts"
],
"declares"
:
[
"vs/base/winjs.base.d.ts"
]
}
\ No newline at end of file
"declares"
:
[]
}
src/vs/base/common/winjs.base.d.ts
已删除
100644 → 0
浏览文件 @
a99079f1
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
/// Interfaces for WinJS
export
type
ErrorCallback
=
(
error
:
any
)
=>
void
;
export
class
Promise
<
T
=
any
>
{
constructor
(
executor
:
(
resolve
:
(
value
:
T
|
PromiseLike
<
T
>
)
=>
void
,
reject
:
(
reason
:
any
)
=>
void
)
=>
void
);
public
then
<
TResult1
=
T
,
TResult2
=
never
>
(
onfulfilled
?:
((
value
:
T
)
=>
TResult1
|
PromiseLike
<
TResult1
>
)
|
null
,
onrejected
?:
((
reason
:
any
)
=>
TResult2
|
PromiseLike
<
TResult2
>
)
|
null
):
Promise
<
TResult1
|
TResult2
>
;
public
static
as
(
value
:
null
):
Promise
<
null
>
;
public
static
as
(
value
:
undefined
):
Promise
<
undefined
>
;
public
static
as
<
T
>
(
value
:
PromiseLike
<
T
>
):
PromiseLike
<
T
>
;
public
static
as
<
T
,
SomePromise
extends
PromiseLike
<
T
>>
(
value
:
SomePromise
):
SomePromise
;
public
static
as
<
T
>
(
value
:
T
):
Promise
<
T
>
;
public
static
join
<
T1
,
T2
>
(
promises
:
[
T1
|
PromiseLike
<
T1
>
,
T2
|
PromiseLike
<
T2
>
]):
Promise
<
[
T1
,
T2
]
>
;
public
static
join
<
T
>
(
promises
:
(
T
|
PromiseLike
<
T
>
)[]):
Promise
<
T
[]
>
;
public
static
wrap
<
T
>
(
value
:
T
|
PromiseLike
<
T
>
):
Promise
<
T
>
;
public
static
wrapError
<
T
=
never
>
(
error
:
Error
):
Promise
<
T
>
;
/**
* @internal
*/
public
static
addEventListener
(
event
:
'
error
'
,
promiseErrorHandler
:
(
e
:
IPromiseError
)
=>
void
):
void
;
}
export
type
TValueCallback
<
T
=
any
>
=
(
value
:
T
|
PromiseLike
<
T
>
)
=>
void
;
export
{
Promise
as
TPromise
,
TValueCallback
as
ValueCallback
};
export
interface
IPromiseErrorDetail
{
parent
:
Promise
;
error
:
any
;
id
:
number
;
handler
:
Function
;
exception
:
Error
;
}
export
interface
IPromiseError
{
detail
:
IPromiseErrorDetail
;
}
src/vs/base/common/winjs.base.js
已删除
100644 → 0
浏览文件 @
a99079f1
此差异已折叠。
点击以展开。
src/vs/base/test/common/async.test.ts
浏览文件 @
11fb2c13
...
...
@@ -39,17 +39,6 @@ suite('Async', () => {
return
result
;
});
// test('Cancel callback behaviour', async function () {
// let withCancelCallback = new WinJsPromise(() => { }, () => { });
// let withoutCancelCallback = new TPromise(() => { });
// withCancelCallback.cancel();
// (withoutCancelCallback as WinJsPromise).cancel();
// await withCancelCallback.then(undefined, err => { assert.ok(isPromiseCanceledError(err)); });
// await withoutCancelCallback.then(undefined, err => { assert.ok(isPromiseCanceledError(err)); });
// });
// Cancelling a sync cancelable promise will fire the cancelled token.
// Also, every `then` callback runs in another execution frame.
test
(
'
CancelablePromise execution order (sync)
'
,
function
()
{
...
...
@@ -95,50 +84,6 @@ suite('Async', () => {
return
promise
.
then
(()
=>
assert
.
deepEqual
(
order
,
[
'
in callback
'
,
'
afterCreate
'
,
'
cancelled
'
,
'
afterCancel
'
,
'
finally
'
]));
});
// // Cancelling a sync tpromise will NOT cancel the promise, since it has resolved already.
// // Every `then` callback runs sync in the same execution frame, thus `finally` executes
// // before `afterCancel`.
// test('TPromise execution order (sync)', function () {
// const order = [];
// let promise = new WinJsPromise(resolve => {
// order.push('in executor');
// resolve(1234);
// }, () => order.push('cancelled'));
// order.push('afterCreate');
// promise = promise
// .then(void 0, err => null)
// .then(() => order.push('finally'));
// promise.cancel();
// order.push('afterCancel');
// return promise.then(() => assert.deepEqual(order, ['in executor', 'afterCreate', 'finally', 'afterCancel']));
// });
// // Cancelling an async tpromise will cancel the promise.
// // Every `then` callback runs sync on the same execution frame as the `cancel` call,
// // so finally still executes before `afterCancel`.
// test('TPromise execution order (async)', function () {
// const order = [];
// let promise = new WinJsPromise(resolve => {
// order.push('in executor');
// setTimeout(() => resolve(1234));
// }, () => order.push('cancelled'));
// order.push('afterCreate');
// promise = promise
// .then(void 0, err => null)
// .then(() => order.push('finally'));
// promise.cancel();
// order.push('afterCancel');
// return promise.then(() => assert.deepEqual(order, ['in executor', 'afterCreate', 'cancelled', 'finally', 'afterCancel']));
// });
test
(
'
cancelablePromise - get inner result
'
,
async
function
()
{
let
promise
=
async
.
createCancelablePromise
(
token
=>
{
return
async
.
timeout
(
12
).
then
(
_
=>
1234
);
...
...
src/vs/base/test/common/winjs.promise.test.ts
已删除
100644 → 0
浏览文件 @
a99079f1
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import
*
as
assert
from
'
assert
'
;
import
*
as
winjs
from
'
vs/base/common/winjs.base
'
;
suite
(
'
WinJS and ES6 Promises
'
,
function
()
{
test
(
'
Promise.resolve
'
,
()
=>
{
let
resolveTPromise
;
const
tPromise
=
new
winjs
.
Promise
((
c
,
e
)
=>
{
resolveTPromise
=
c
;
});
const
es6Promise
=
Promise
.
resolve
(
tPromise
);
const
done
=
es6Promise
.
then
(
function
(
result
)
{
assert
.
equal
(
result
,
'
passed
'
);
});
resolveTPromise
(
'
passed
'
);
return
done
;
});
test
(
'
new Promise
'
,
function
()
{
let
resolveTPromise
;
const
tPromise
=
new
winjs
.
Promise
((
c
,
e
)
=>
{
resolveTPromise
=
c
;
});
const
es6Promise
=
new
Promise
(
function
(
c
,
e
)
{
c
(
tPromise
);
});
const
done
=
es6Promise
.
then
(
function
(
result
)
{
assert
.
equal
(
result
,
'
passed
'
);
});
resolveTPromise
(
'
passed
'
);
return
done
;
});
test
(
'
1. Uncaught TypeError: this._state.then is not a function
'
,
()
=>
{
let
p1
=
winjs
.
Promise
.
wrap
<
number
>
(
new
Promise
<
number
>
(
function
(
c
,
e
)
{
c
(
1
);
}));
Promise
.
all
([
p1
]);
});
test
(
'
2. Uncaught TypeError: this._state.then is not a function
'
,
()
=>
{
let
p1
=
winjs
.
Promise
.
wrap
<
number
>
(
new
Promise
<
number
>
(
function
(
c
,
e
)
{
c
(
1
);
}));
let
thenFunc
=
p1
.
then
.
bind
(
p1
);
setTimeout
(()
=>
{
thenFunc
(()
=>
0
);
},
0
);
});
test
(
'
3. Uncaught TypeError: this._state.then is not a function
'
,
()
=>
{
let
c
;
let
p1
=
new
winjs
.
Promise
(
function
(
_c
,
e
)
{
c
=
_c
;
});
let
thenFunc
=
p1
.
then
.
bind
(
p1
);
setTimeout
(()
=>
{
c
(
1
);
thenFunc
(()
=>
0
);
},
0
);
});
});
src/vs/platform/extensionManagement/node/extensionManagementService.ts
浏览文件 @
11fb2c13
...
...
@@ -10,7 +10,6 @@ import { assign } from 'vs/base/common/objects';
import
{
toDisposable
,
Disposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
flatten
}
from
'
vs/base/common/arrays
'
;
import
{
extract
,
ExtractError
,
zip
,
IFile
}
from
'
vs/platform/node/zip
'
;
import
{
ValueCallback
,
ErrorCallback
}
from
'
vs/base/common/winjs.base
'
;
import
{
IExtensionManagementService
,
IExtensionGalleryService
,
ILocalExtension
,
IGalleryExtension
,
IExtensionManifest
,
IGalleryMetadata
,
...
...
@@ -292,7 +291,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
if
(
!
cancellablePromise
)
{
let
operation
:
InstallOperation
=
InstallOperation
.
Install
;
let
cancellationToken
:
CancellationToken
,
successCallback
:
ValueCallback
<
void
>
,
errorCallback
:
ErrorCallback
;
let
cancellationToken
:
CancellationToken
,
successCallback
:
(
a
?:
any
)
=>
void
,
errorCallback
:
(
e
?:
any
)
=>
any
;
cancellablePromise
=
createCancelablePromise
(
token
=>
{
cancellationToken
=
token
;
return
new
Promise
((
c
,
e
)
=>
{
successCallback
=
c
;
errorCallback
=
e
;
});
});
this
.
installingExtensions
.
set
(
key
,
cancellablePromise
);
...
...
test/all.js
浏览文件 @
11fb2c13
...
...
@@ -50,9 +50,9 @@ function main() {
baseUrl
:
path
.
join
(
path
.
dirname
(
__dirname
),
'
src
'
),
paths
:
{
'
vs/css
'
:
'
../test/css.mock
'
,
'
vs
'
:
`../
${
out
}
/vs`
,
'
lib
'
:
`../
${
out
}
/lib`
,
'
bootstrap-fork
'
:
`../
${
out
}
/bootstrap-fork`
'
vs
'
:
`../
${
out
}
/vs`
,
'
lib
'
:
`../
${
out
}
/lib`
,
'
bootstrap-fork
'
:
`../
${
out
}
/bootstrap-fork`
},
catchError
:
true
};
...
...
@@ -79,10 +79,10 @@ function main() {
if
(
argv
.
forceLoad
)
{
var
allFiles
=
glob
.
sync
(
out
+
'
/vs/**/*.js
'
);
allFiles
=
allFiles
.
map
(
function
(
source
)
{
allFiles
=
allFiles
.
map
(
function
(
source
)
{
return
path
.
join
(
__dirname
,
'
..
'
,
source
);
});
allFiles
=
allFiles
.
filter
(
function
(
source
)
{
allFiles
=
allFiles
.
filter
(
function
(
source
)
{
if
(
seenSources
[
source
])
{
return
false
;
}
...
...
@@ -94,7 +94,7 @@ function main() {
}
return
true
;
});
allFiles
.
forEach
(
function
(
source
,
index
)
{
allFiles
.
forEach
(
function
(
source
,
index
)
{
var
contents
=
fs
.
readFileSync
(
source
).
toString
();
contents
=
instrumenter
.
instrumentSync
(
contents
,
source
);
var
stopAt
=
contents
.
indexOf
(
'
}
\n
__cov
'
);
...
...
@@ -106,18 +106,18 @@ function main() {
});
}
let
remapIgnores
=
/
\b((
winjs
\.
base
)
|
(
marked
)
|
(
raw
\.
marked
)
|
(
nls
)
|
(
css
))\.
js$/
;
let
remapIgnores
=
/
\b((
marked
)
|
(
raw
\.
marked
)
|
(
nls
)
|
(
css
))\.
js$/
;
var
remappedCoverage
=
i_remap
(
global
.
__coverage__
,
{
exclude
:
remapIgnores
}).
getFinalCoverage
();
// The remapped coverage comes out with broken paths
var
toUpperDriveLetter
=
function
(
str
)
{
var
toUpperDriveLetter
=
function
(
str
)
{
if
(
/^
[
a-z
]
:/
.
test
(
str
))
{
return
str
.
charAt
(
0
).
toUpperCase
()
+
str
.
substr
(
1
);
}
return
str
;
};
var
toLowerDriveLetter
=
function
(
str
)
{
var
toLowerDriveLetter
=
function
(
str
)
{
if
(
/^
[
A-Z
]
:/
.
test
(
str
))
{
return
str
.
charAt
(
0
).
toLowerCase
()
+
str
.
substr
(
1
);
}
...
...
@@ -125,7 +125,7 @@ function main() {
};
var
REPO_PATH
=
toUpperDriveLetter
(
path
.
join
(
__dirname
,
'
..
'
));
var
fixPath
=
function
(
brokenPath
)
{
var
fixPath
=
function
(
brokenPath
)
{
var
startIndex
=
brokenPath
.
indexOf
(
REPO_PATH
);
if
(
startIndex
===
-
1
)
{
return
toLowerDriveLetter
(
brokenPath
);
...
...
@@ -154,7 +154,7 @@ function main() {
}
var
reporter
=
new
istanbul
.
Reporter
(
null
,
coveragePath
);
reporter
.
addAll
(
reportTypes
);
reporter
.
write
(
collector
,
true
,
function
()
{});
reporter
.
write
(
collector
,
true
,
function
()
{
});
});
}
...
...
@@ -196,7 +196,7 @@ function main() {
};
}
else
if
(
argv
.
run
)
{
var
tests
=
(
typeof
argv
.
run
===
'
string
'
)
?
[
argv
.
run
]
:
argv
.
run
;
var
modulesToLoad
=
tests
.
map
(
function
(
test
)
{
var
modulesToLoad
=
tests
.
map
(
function
(
test
)
{
test
=
test
.
replace
(
/^src/
,
'
out
'
);
test
=
test
.
replace
(
/
\.
ts$/
,
'
.js
'
);
return
path
.
relative
(
src
,
path
.
resolve
(
test
)).
replace
(
/
(\.
js
)
|
(\.
js
\.
map
)
$/
,
''
).
replace
(
/
\\
/g
,
'
/
'
);
...
...
@@ -205,12 +205,12 @@ function main() {
define
(
modulesToLoad
,
()
=>
cb
(
null
),
cb
);
};
}
else
if
(
argv
[
'
only-monaco-editor
'
])
{
loadFunc
=
function
(
cb
)
{
loadFunc
=
function
(
cb
)
{
glob
(
TEST_GLOB
,
{
cwd
:
src
},
function
(
err
,
files
)
{
var
modulesToLoad
=
files
.
map
(
function
(
file
)
{
return
file
.
replace
(
/
\.
js$/
,
''
);
});
modulesToLoad
=
modulesToLoad
.
filter
(
function
(
module
)
{
modulesToLoad
=
modulesToLoad
.
filter
(
function
(
module
)
{
if
(
/^vs
\/
workbench
\/
/
.
test
(
module
))
{
return
false
;
}
...
...
@@ -227,7 +227,7 @@ function main() {
});
};
}
else
{
loadFunc
=
function
(
cb
)
{
loadFunc
=
function
(
cb
)
{
glob
(
TEST_GLOB
,
{
cwd
:
src
},
function
(
err
,
files
)
{
var
modulesToLoad
=
files
.
map
(
function
(
file
)
{
return
file
.
replace
(
/
\.
js$/
,
''
);
...
...
@@ -237,7 +237,7 @@ function main() {
};
}
loadFunc
(
function
(
err
)
{
loadFunc
(
function
(
err
)
{
if
(
err
)
{
console
.
error
(
err
);
return
process
.
exit
(
1
);
...
...
@@ -270,7 +270,7 @@ function main() {
});
// replace the default unexpected error handler to be useful during tests
loader
([
'
vs/base/common/errors
'
],
function
(
errors
)
{
loader
([
'
vs/base/common/errors
'
],
function
(
errors
)
{
errors
.
setUnexpectedErrorHandler
(
function
(
err
)
{
let
stack
=
(
err
&&
err
.
stack
)
||
(
new
Error
().
stack
);
unexpectedErrors
.
push
((
err
&&
err
.
message
?
err
.
message
:
err
)
+
'
\n
'
+
stack
);
...
...
@@ -286,4 +286,4 @@ if (process.argv.some(function (a) { return /^--browser/.test(a); })) {
require
(
'
./browser
'
);
}
else
{
main
();
}
\ No newline at end of file
}
test/electron/renderer.js
浏览文件 @
11fb2c13
...
...
@@ -63,7 +63,7 @@ function createCoverageReport(opts) {
return
resolve
(
undefined
);
}
const
exclude
=
/
\b((
winjs
\.
base
)
|
(
marked
)
|
(
raw
\.
marked
)
|
(
nls
)
|
(
css
))\.
js$/
;
const
exclude
=
/
\b((
marked
)
|
(
raw
\.
marked
)
|
(
nls
)
|
(
css
))\.
js$/
;
const
remappedCoverage
=
i_remap
(
global
.
__coverage__
,
{
exclude
:
exclude
}).
getFinalCoverage
();
// The remapped coverage comes out with broken paths
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录