Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
72a6af46
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,发现更多精彩内容 >>
提交
72a6af46
编写于
10月 30, 2019
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
default to file-scheme unless strict is set, no more warnings tho
上级
21247028
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
5 addition
and
29 deletion
+5
-29
src/vs/base/common/uri.ts
src/vs/base/common/uri.ts
+4
-23
src/vs/monaco.d.ts
src/vs/monaco.d.ts
+0
-1
src/vs/workbench/services/extensions/common/extensionHostMain.ts
...workbench/services/extensions/common/extensionHostMain.ts
+1
-5
未找到文件。
src/vs/base/common/uri.ts
浏览文件 @
72a6af46
...
...
@@ -10,26 +10,11 @@ const _schemePattern = /^\w[\w\d+.-]*$/;
const
_singleSlashStart
=
/^
\/
/
;
const
_doubleSlashStart
=
/^
\/\/
/
;
let
_throwOnMissingSchema
:
boolean
=
true
;
/**
* @internal
*/
export
function
setUriThrowOnMissingScheme
(
value
:
boolean
):
boolean
{
const
old
=
_throwOnMissingSchema
;
_throwOnMissingSchema
=
value
;
return
old
;
}
function
_validateUri
(
ret
:
URI
,
_strict
?:
boolean
):
void
{
// scheme, must be set
if
(
!
ret
.
scheme
)
{
if
(
_strict
||
_throwOnMissingSchema
)
{
throw
new
Error
(
`[UriError]: Scheme is missing: {scheme: "", authority: "
${
ret
.
authority
}
", path: "
${
ret
.
path
}
", query: "
${
ret
.
query
}
", fragment: "
${
ret
.
fragment
}
"}`
);
}
else
{
console
.
warn
(
`[UriError]: Scheme is missing: {scheme: "", authority: "
${
ret
.
authority
}
", path: "
${
ret
.
path
}
", query: "
${
ret
.
query
}
", fragment: "
${
ret
.
fragment
}
"}`
);
}
if
(
!
ret
.
scheme
&&
_strict
)
{
throw
new
Error
(
`[UriError]: Scheme is missing: {scheme: "", authority: "
${
ret
.
authority
}
", path: "
${
ret
.
path
}
", query: "
${
ret
.
query
}
", fragment: "
${
ret
.
fragment
}
"}`
);
}
// scheme, https://tools.ietf.org/html/rfc3986#section-3.1
...
...
@@ -61,12 +46,8 @@ function _validateUri(ret: URI, _strict?: boolean): void {
// back to the file-scheme. that should cause the least carnage and still be a
// clear warning
function
_schemeFix
(
scheme
:
string
,
_strict
:
boolean
):
string
{
if
(
_strict
||
_throwOnMissingSchema
)
{
return
scheme
||
_empty
;
}
if
(
!
scheme
)
{
console
.
trace
(
'
BAD uri lacks scheme, falling back to file-scheme.
'
);
scheme
=
'
file
'
;
if
(
!
scheme
&&
!
_strict
)
{
return
'
file
'
;
}
return
scheme
;
}
...
...
src/vs/monaco.d.ts
浏览文件 @
72a6af46
...
...
@@ -55,7 +55,6 @@ declare namespace monaco {
*/
readonly
onCancellationRequested
:
IEvent
<
any
>
;
}
/**
* Uniform Resource Identifier (Uri) http://tools.ietf.org/html/rfc3986.
* This class is a simple parser which creates the basic component parts
...
...
src/vs/workbench/services/extensions/common/extensionHostMain.ts
浏览文件 @
72a6af46
...
...
@@ -6,7 +6,7 @@
import
{
timeout
}
from
'
vs/base/common/async
'
;
import
*
as
errors
from
'
vs/base/common/errors
'
;
import
{
DisposableStore
}
from
'
vs/base/common/lifecycle
'
;
import
{
URI
,
setUriThrowOnMissingScheme
}
from
'
vs/base/common/uri
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
{
IURITransformer
}
from
'
vs/base/common/uriIpc
'
;
import
{
IMessagePassingProtocol
}
from
'
vs/base/parts/ipc/common/ipc
'
;
import
{
IInitData
,
MainContext
,
MainThreadConsoleShape
}
from
'
vs/workbench/api/common/extHost.protocol
'
;
...
...
@@ -22,10 +22,6 @@ import { IExtHostRpcService, ExtHostRpcService } from 'vs/workbench/api/common/e
import
{
IURITransformerService
,
URITransformerService
}
from
'
vs/workbench/api/common/extHostUriTransformerService
'
;
import
{
IExtHostExtensionService
,
IHostUtils
}
from
'
vs/workbench/api/common/extHostExtensionService
'
;
// we don't (yet) throw when extensions parse
// uris that have no scheme
setUriThrowOnMissingScheme
(
false
);
export
interface
IExitFn
{
(
code
?:
number
):
any
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录