Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
6e8f6596
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,发现更多精彩内容 >>
提交
6e8f6596
编写于
4月 20, 2016
作者:
M
Martin Aeschlimann
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update to jsonc-parser 0.2.0
上级
85f337ee
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
63 addition
and
59 deletion
+63
-59
extensions/javascript/package.json
extensions/javascript/package.json
+1
-1
extensions/javascript/src/features/bowerJSONContribution.ts
extensions/javascript/src/features/bowerJSONContribution.ts
+11
-9
extensions/javascript/src/features/jsonContributions.ts
extensions/javascript/src/features/jsonContributions.ts
+2
-2
extensions/javascript/src/features/packageJSONContribution.ts
...nsions/javascript/src/features/packageJSONContribution.ts
+48
-46
extensions/json/server/package.json
extensions/json/server/package.json
+1
-1
未找到文件。
extensions/javascript/package.json
浏览文件 @
6e8f6596
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
"dependencies"
:
{
"dependencies"
:
{
"vscode-nls"
:
"^1.0.4"
,
"vscode-nls"
:
"^1.0.4"
,
"request-light"
:
"^0.1.0"
,
"request-light"
:
"^0.1.0"
,
"jsonc-parser"
:
"^0.
1
.0"
"jsonc-parser"
:
"^0.
2
.0"
},
},
"scripts"
:
{
"scripts"
:
{
"compile"
:
"gulp compile-extension:javascript"
,
"compile"
:
"gulp compile-extension:javascript"
,
...
...
extensions/javascript/src/features/bowerJSONContribution.ts
浏览文件 @
6e8f6596
...
@@ -162,15 +162,17 @@ export class BowerJSONContribution implements IJSONContribution {
...
@@ -162,15 +162,17 @@ export class BowerJSONContribution implements IJSONContribution {
public
getInfoContribution
(
resource
:
string
,
location
:
Location
):
Thenable
<
MarkedString
[]
>
{
public
getInfoContribution
(
resource
:
string
,
location
:
Location
):
Thenable
<
MarkedString
[]
>
{
if
((
location
.
matches
([
'
dependencies
'
,
'
*
'
])
||
location
.
matches
([
'
devDependencies
'
,
'
*
'
])))
{
if
((
location
.
matches
([
'
dependencies
'
,
'
*
'
])
||
location
.
matches
([
'
devDependencies
'
,
'
*
'
])))
{
let
pack
=
location
.
segments
[
location
.
segments
.
length
-
1
];
let
pack
=
location
.
path
[
location
.
path
.
length
-
1
];
let
htmlContent
:
MarkedString
[]
=
[];
if
(
typeof
pack
===
'
string
'
)
{
htmlContent
.
push
(
localize
(
'
json.bower.package.hover
'
,
'
{0}
'
,
pack
));
let
htmlContent
:
MarkedString
[]
=
[];
return
this
.
getInfo
(
pack
).
then
(
documentation
=>
{
htmlContent
.
push
(
localize
(
'
json.bower.package.hover
'
,
'
{0}
'
,
pack
));
if
(
documentation
)
{
return
this
.
getInfo
(
pack
).
then
(
documentation
=>
{
htmlContent
.
push
(
documentation
);
if
(
documentation
)
{
}
htmlContent
.
push
(
documentation
);
return
htmlContent
;
}
});
return
htmlContent
;
});
}
}
}
return
null
;
return
null
;
}
}
...
...
extensions/javascript/src/features/jsonContributions.ts
浏览文件 @
6e8f6596
...
@@ -120,7 +120,7 @@ export class JSONCompletionItemProvider implements CompletionItemProvider {
...
@@ -120,7 +120,7 @@ export class JSONCompletionItemProvider implements CompletionItemProvider {
let
collectPromise
:
Thenable
<
any
>
=
null
;
let
collectPromise
:
Thenable
<
any
>
=
null
;
if
(
location
.
completePropert
y
)
{
if
(
location
.
isAtPropertyKe
y
)
{
let
addValue
=
!
location
.
previousNode
||
!
location
.
previousNode
.
columnOffset
;
let
addValue
=
!
location
.
previousNode
||
!
location
.
previousNode
.
columnOffset
;
let
scanner
=
createScanner
(
document
.
getText
(),
true
);
let
scanner
=
createScanner
(
document
.
getText
(),
true
);
scanner
.
setPosition
(
offset
);
scanner
.
setPosition
(
offset
);
...
@@ -128,7 +128,7 @@ export class JSONCompletionItemProvider implements CompletionItemProvider {
...
@@ -128,7 +128,7 @@ export class JSONCompletionItemProvider implements CompletionItemProvider {
let
isLast
=
scanner
.
getToken
()
===
SyntaxKind
.
CloseBraceToken
||
scanner
.
getToken
()
===
SyntaxKind
.
EOF
;
let
isLast
=
scanner
.
getToken
()
===
SyntaxKind
.
CloseBraceToken
||
scanner
.
getToken
()
===
SyntaxKind
.
EOF
;
collectPromise
=
this
.
jsonContribution
.
collectPropertySuggestions
(
fileName
,
location
,
currentWord
,
addValue
,
isLast
,
collector
);
collectPromise
=
this
.
jsonContribution
.
collectPropertySuggestions
(
fileName
,
location
,
currentWord
,
addValue
,
isLast
,
collector
);
}
else
{
}
else
{
if
(
location
.
segments
.
length
===
0
)
{
if
(
location
.
path
.
length
===
0
)
{
collectPromise
=
this
.
jsonContribution
.
collectDefaultSuggestions
(
fileName
,
collector
);
collectPromise
=
this
.
jsonContribution
.
collectDefaultSuggestions
(
fileName
,
collector
);
}
else
{
}
else
{
collectPromise
=
this
.
jsonContribution
.
collectValueSuggestions
(
fileName
,
location
,
collector
);
collectPromise
=
this
.
jsonContribution
.
collectValueSuggestions
(
fileName
,
location
,
collector
);
...
...
extensions/javascript/src/features/packageJSONContribution.ts
浏览文件 @
6e8f6596
...
@@ -117,44 +117,45 @@ export class PackageJSONContribution implements IJSONContribution {
...
@@ -117,44 +117,45 @@ export class PackageJSONContribution implements IJSONContribution {
public
collectValueSuggestions
(
fileName
:
string
,
location
:
Location
,
result
:
ISuggestionsCollector
):
Thenable
<
any
>
{
public
collectValueSuggestions
(
fileName
:
string
,
location
:
Location
,
result
:
ISuggestionsCollector
):
Thenable
<
any
>
{
if
((
location
.
matches
([
'
dependencies
'
,
'
*
'
])
||
location
.
matches
([
'
devDependencies
'
,
'
*
'
])
||
location
.
matches
([
'
optionalDependencies
'
,
'
*
'
])
||
location
.
matches
([
'
peerDependencies
'
,
'
*
'
])))
{
if
((
location
.
matches
([
'
dependencies
'
,
'
*
'
])
||
location
.
matches
([
'
devDependencies
'
,
'
*
'
])
||
location
.
matches
([
'
optionalDependencies
'
,
'
*
'
])
||
location
.
matches
([
'
peerDependencies
'
,
'
*
'
])))
{
let
currentKey
=
location
.
segments
[
location
.
segments
.
length
-
1
];
let
currentKey
=
location
.
path
[
location
.
path
.
length
-
1
];
let
queryUrl
=
'
http://registry.npmjs.org/
'
+
encodeURIComponent
(
currentKey
)
+
'
/latest
'
;
if
(
typeof
currentKey
===
'
string
'
)
{
let
queryUrl
=
'
http://registry.npmjs.org/
'
+
encodeURIComponent
(
currentKey
)
+
'
/latest
'
;
return
this
.
xhr
({
return
this
.
xhr
({
url
:
queryUrl
url
:
queryUrl
}).
then
((
success
)
=>
{
}).
then
((
success
)
=>
{
try
{
try
{
let
obj
=
JSON
.
parse
(
success
.
responseText
);
let
obj
=
JSON
.
parse
(
success
.
responseText
);
if
(
obj
&&
obj
.
version
)
{
if
(
obj
&&
obj
.
version
)
{
let
version
=
obj
.
version
;
let
version
=
obj
.
version
;
let
name
=
JSON
.
stringify
(
version
);
let
name
=
JSON
.
stringify
(
version
);
let
proposal
=
new
CompletionItem
(
name
);
let
proposal
=
new
CompletionItem
(
name
);
proposal
.
kind
=
CompletionItemKind
.
Property
;
proposal
.
kind
=
CompletionItemKind
.
Property
;
proposal
.
insertText
=
name
;
proposal
.
insertText
=
name
;
proposal
.
documentation
=
localize
(
'
json.npm.latestversion
'
,
'
The currently latest version of the package
'
);
proposal
.
documentation
=
localize
(
'
json.npm.latestversion
'
,
'
The currently latest version of the package
'
);
result
.
add
(
proposal
);
result
.
add
(
proposal
);
name
=
JSON
.
stringify
(
'
^
'
+
version
);
name
=
JSON
.
stringify
(
'
^
'
+
version
);
proposal
=
new
CompletionItem
(
name
);
proposal
=
new
CompletionItem
(
name
);
proposal
.
kind
=
CompletionItemKind
.
Property
;
proposal
.
kind
=
CompletionItemKind
.
Property
;
proposal
.
insertText
=
name
;
proposal
.
insertText
=
name
;
proposal
.
documentation
=
localize
(
'
json.npm.majorversion
'
,
'
Matches the most recent major version (1.x.x)
'
);
proposal
.
documentation
=
localize
(
'
json.npm.majorversion
'
,
'
Matches the most recent major version (1.x.x)
'
);
result
.
add
(
proposal
);
result
.
add
(
proposal
);
name
=
JSON
.
stringify
(
'
~
'
+
version
);
name
=
JSON
.
stringify
(
'
~
'
+
version
);
proposal
=
new
CompletionItem
(
name
);
proposal
=
new
CompletionItem
(
name
);
proposal
.
kind
=
CompletionItemKind
.
Property
;
proposal
.
kind
=
CompletionItemKind
.
Property
;
proposal
.
insertText
=
name
;
proposal
.
insertText
=
name
;
proposal
.
documentation
=
localize
(
'
json.npm.minorversion
'
,
'
Matches the most recent minor version (1.2.x)
'
);
proposal
.
documentation
=
localize
(
'
json.npm.minorversion
'
,
'
Matches the most recent minor version (1.2.x)
'
);
result
.
add
(
proposal
);
result
.
add
(
proposal
);
}
}
catch
(
e
)
{
// ignore
}
}
}
catch
(
e
)
{
return
0
;
// ignore
},
(
error
)
=>
{
}
return
0
;
return
0
;
});
},
(
error
)
=>
{
}
return
0
;
});
}
}
return
null
;
return
null
;
}
}
...
@@ -204,16 +205,17 @@ export class PackageJSONContribution implements IJSONContribution {
...
@@ -204,16 +205,17 @@ export class PackageJSONContribution implements IJSONContribution {
public
getInfoContribution
(
fileName
:
string
,
location
:
Location
):
Thenable
<
MarkedString
[]
>
{
public
getInfoContribution
(
fileName
:
string
,
location
:
Location
):
Thenable
<
MarkedString
[]
>
{
if
((
location
.
matches
([
'
dependencies
'
,
'
*
'
])
||
location
.
matches
([
'
devDependencies
'
,
'
*
'
])
||
location
.
matches
([
'
optionalDependencies
'
,
'
*
'
])
||
location
.
matches
([
'
peerDependencies
'
,
'
*
'
])))
{
if
((
location
.
matches
([
'
dependencies
'
,
'
*
'
])
||
location
.
matches
([
'
devDependencies
'
,
'
*
'
])
||
location
.
matches
([
'
optionalDependencies
'
,
'
*
'
])
||
location
.
matches
([
'
peerDependencies
'
,
'
*
'
])))
{
let
pack
=
location
.
segments
[
location
.
segments
.
length
-
1
];
let
pack
=
location
.
path
[
location
.
path
.
length
-
1
];
if
(
typeof
pack
===
'
string
'
)
{
let
htmlContent
:
MarkedString
[]
=
[];
let
htmlContent
:
MarkedString
[]
=
[];
htmlContent
.
push
(
localize
(
'
json.npm.package.hover
'
,
'
{0}
'
,
pack
));
htmlContent
.
push
(
localize
(
'
json.npm.package.hover
'
,
'
{0}
'
,
pack
));
return
this
.
getInfo
(
pack
).
then
(
infos
=>
{
return
this
.
getInfo
(
pack
).
then
(
infos
=>
{
infos
.
forEach
(
info
=>
{
infos
.
forEach
(
info
=>
{
htmlContent
.
push
(
info
);
htmlContent
.
push
(
info
);
});
return
htmlContent
;
});
});
return
htmlContent
;
}
});
}
}
return
null
;
return
null
;
}
}
...
...
extensions/json/server/package.json
浏览文件 @
6e8f6596
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
},
},
"dependencies"
:
{
"dependencies"
:
{
"request-light"
:
"^0.1.0"
,
"request-light"
:
"^0.1.0"
,
"jsonc-parser"
:
"^0.
1
.0"
,
"jsonc-parser"
:
"^0.
2
.0"
,
"vscode-languageserver"
:
"^1.3.0"
,
"vscode-languageserver"
:
"^1.3.0"
,
"vscode-nls"
:
"^1.0.4"
"vscode-nls"
:
"^1.0.4"
},
},
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录