Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
48995929
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,发现更多精彩内容 >>
提交
48995929
编写于
8月 12, 2020
作者:
M
Martin Aeschlimann
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
npm.fetchOnlinePackageInfo is not respected in latest build. Fixes #103540
上级
de7bb5b5
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
24 addition
and
12 deletion
+24
-12
extensions/npm/src/features/bowerJSONContribution.ts
extensions/npm/src/features/bowerJSONContribution.ts
+13
-8
extensions/npm/src/features/jsonContributions.ts
extensions/npm/src/features/jsonContributions.ts
+1
-1
extensions/npm/src/features/packageJSONContribution.ts
extensions/npm/src/features/packageJSONContribution.ts
+10
-3
未找到文件。
extensions/npm/src/features/bowerJSONContribution.ts
浏览文件 @
48995929
...
...
@@ -33,7 +33,7 @@ export class BowerJSONContribution implements IJSONContribution {
return
[{
language
:
'
json
'
,
scheme
:
'
*
'
,
pattern
:
'
**/bower.json
'
},
{
language
:
'
json
'
,
scheme
:
'
*
'
,
pattern
:
'
**/.bower.json
'
}];
}
private
online
Enabled
()
{
private
is
Enabled
()
{
return
!!
workspace
.
getConfiguration
(
'
npm
'
).
get
(
'
fetchOnlinePackageInfo
'
);
}
...
...
@@ -54,8 +54,11 @@ export class BowerJSONContribution implements IJSONContribution {
}
public
collectPropertySuggestions
(
_resource
:
string
,
location
:
Location
,
currentWord
:
string
,
addValue
:
boolean
,
isLast
:
boolean
,
collector
:
ISuggestionsCollector
):
Thenable
<
any
>
|
null
{
if
(
!
this
.
isEnabled
())
{
return
null
;
}
if
((
location
.
matches
([
'
dependencies
'
])
||
location
.
matches
([
'
devDependencies
'
])))
{
if
(
currentWord
.
length
>
0
&&
this
.
onlineEnabled
()
)
{
if
(
currentWord
.
length
>
0
)
{
const
queryUrl
=
'
https://registry.bower.io/packages/search/
'
+
encodeURIComponent
(
currentWord
);
return
this
.
xhr
({
...
...
@@ -122,7 +125,10 @@ export class BowerJSONContribution implements IJSONContribution {
return
null
;
}
public
collectValueSuggestions
(
_resource
:
string
,
location
:
Location
,
collector
:
ISuggestionsCollector
):
Thenable
<
any
>
{
public
collectValueSuggestions
(
_resource
:
string
,
location
:
Location
,
collector
:
ISuggestionsCollector
):
Promise
<
any
>
|
null
{
if
(
!
this
.
isEnabled
())
{
return
null
;
}
if
((
location
.
matches
([
'
dependencies
'
,
'
*
'
])
||
location
.
matches
([
'
devDependencies
'
,
'
*
'
])))
{
// not implemented. Could be do done calling the bower command. Waiting for web API: https://github.com/bower/registry/issues/26
const
proposal
=
new
CompletionItem
(
localize
(
'
json.bower.latest.version
'
,
'
latest
'
));
...
...
@@ -132,7 +138,7 @@ export class BowerJSONContribution implements IJSONContribution {
proposal
.
documentation
=
'
The latest version of the package
'
;
collector
.
add
(
proposal
);
}
return
Promise
.
resolve
(
null
)
;
return
null
;
}
public
resolveSuggestion
(
item
:
CompletionItem
):
Thenable
<
CompletionItem
|
null
>
|
null
{
...
...
@@ -149,10 +155,6 @@ export class BowerJSONContribution implements IJSONContribution {
}
private
getInfo
(
pack
:
string
):
Thenable
<
string
|
undefined
>
{
if
(
!
this
.
onlineEnabled
())
{
return
Promise
.
resolve
(
undefined
);
}
const
queryUrl
=
'
https://registry.bower.io/packages/
'
+
encodeURIComponent
(
pack
);
return
this
.
xhr
({
...
...
@@ -181,6 +183,9 @@ export class BowerJSONContribution implements IJSONContribution {
}
public
getInfoContribution
(
_resource
:
string
,
location
:
Location
):
Thenable
<
MarkdownString
[]
|
null
>
|
null
{
if
(
!
this
.
isEnabled
())
{
return
null
;
}
if
((
location
.
matches
([
'
dependencies
'
,
'
*
'
])
||
location
.
matches
([
'
devDependencies
'
,
'
*
'
])))
{
const
pack
=
location
.
path
[
location
.
path
.
length
-
1
];
if
(
typeof
pack
===
'
string
'
)
{
...
...
extensions/npm/src/features/jsonContributions.ts
浏览文件 @
48995929
...
...
@@ -25,7 +25,7 @@ export interface IJSONContribution {
getDocumentSelector
():
DocumentSelector
;
getInfoContribution
(
fileName
:
string
,
location
:
Location
):
Thenable
<
MarkedString
[]
|
null
>
|
null
;
collectPropertySuggestions
(
fileName
:
string
,
location
:
Location
,
currentWord
:
string
,
addValue
:
boolean
,
isLast
:
boolean
,
result
:
ISuggestionsCollector
):
Thenable
<
any
>
|
null
;
collectValueSuggestions
(
fileName
:
string
,
location
:
Location
,
result
:
ISuggestionsCollector
):
Thenable
<
any
>
;
collectValueSuggestions
(
fileName
:
string
,
location
:
Location
,
result
:
ISuggestionsCollector
):
Thenable
<
any
>
|
null
;
collectDefaultSuggestions
(
fileName
:
string
,
result
:
ISuggestionsCollector
):
Thenable
<
any
>
;
resolveSuggestion
?(
item
:
CompletionItem
):
Thenable
<
CompletionItem
|
null
>
|
null
;
}
...
...
extensions/npm/src/features/packageJSONContribution.ts
浏览文件 @
48995929
...
...
@@ -51,6 +51,10 @@ export class PackageJSONContribution implements IJSONContribution {
return
Promise
.
resolve
(
null
);
}
private
isEnabled
()
{
return
this
.
canRunNPM
||
this
.
onlineEnabled
();
}
private
onlineEnabled
()
{
return
!!
workspace
.
getConfiguration
(
'
npm
'
).
get
(
'
fetchOnlinePackageInfo
'
);
}
...
...
@@ -63,7 +67,7 @@ export class PackageJSONContribution implements IJSONContribution {
isLast
:
boolean
,
collector
:
ISuggestionsCollector
):
Thenable
<
any
>
|
null
{
if
(
!
this
.
online
Enabled
())
{
if
(
!
this
.
is
Enabled
())
{
return
null
;
}
...
...
@@ -180,7 +184,7 @@ export class PackageJSONContribution implements IJSONContribution {
}
public
async
collectValueSuggestions
(
_fileName
:
string
,
location
:
Location
,
result
:
ISuggestionsCollector
):
Promise
<
any
>
{
if
(
!
this
.
online
Enabled
())
{
if
(
!
this
.
is
Enabled
())
{
return
null
;
}
...
...
@@ -250,7 +254,7 @@ export class PackageJSONContribution implements IJSONContribution {
if
(
this
.
canRunNPM
)
{
info
=
await
this
.
npmView
(
pack
);
}
if
(
!
info
)
{
if
(
!
info
&&
this
.
onlineEnabled
()
)
{
info
=
await
this
.
npmjsView
(
pack
);
}
return
info
;
...
...
@@ -303,6 +307,9 @@ export class PackageJSONContribution implements IJSONContribution {
}
public
getInfoContribution
(
_fileName
:
string
,
location
:
Location
):
Thenable
<
MarkedString
[]
|
null
>
|
null
{
if
(
!
this
.
isEnabled
())
{
return
null
;
}
if
((
location
.
matches
([
'
dependencies
'
,
'
*
'
])
||
location
.
matches
([
'
devDependencies
'
,
'
*
'
])
||
location
.
matches
([
'
optionalDependencies
'
,
'
*
'
])
||
location
.
matches
([
'
peerDependencies
'
,
'
*
'
])))
{
const
pack
=
location
.
path
[
location
.
path
.
length
-
1
];
if
(
typeof
pack
===
'
string
'
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录