Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
bf993214
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,发现更多精彩内容 >>
提交
bf993214
编写于
5月 03, 2018
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Pick up new TS insiders
上级
b9459731
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
10 addition
and
13 deletion
+10
-13
extensions/html-language-features/server/src/modes/javascriptMode.ts
...html-language-features/server/src/modes/javascriptMode.ts
+1
-1
extensions/package.json
extensions/package.json
+1
-1
extensions/typescript-language-features/src/features/fileConfigurationManager.ts
...anguage-features/src/features/fileConfigurationManager.ts
+2
-5
extensions/typescript-language-features/src/features/quickFixProvider.ts
...script-language-features/src/features/quickFixProvider.ts
+3
-3
extensions/yarn.lock
extensions/yarn.lock
+3
-3
未找到文件。
extensions/html-language-features/server/src/modes/javascriptMode.ts
浏览文件 @
bf993214
...
...
@@ -109,7 +109,7 @@ export function getJavaScriptMode(documentRegions: LanguageModelCache<HTMLDocume
},
doResolve
(
document
:
TextDocument
,
item
:
CompletionItem
):
CompletionItem
{
updateCurrentTextDocument
(
document
);
let
details
=
jsLanguageService
.
getCompletionEntryDetails
(
FILE_NAME
,
item
.
data
.
offset
,
item
.
label
,
undefined
,
undefined
);
let
details
=
jsLanguageService
.
getCompletionEntryDetails
(
FILE_NAME
,
item
.
data
.
offset
,
item
.
label
,
undefined
,
undefined
,
undefined
);
if
(
details
)
{
item
.
detail
=
ts
.
displayPartsToString
(
details
.
displayParts
);
item
.
documentation
=
ts
.
displayPartsToString
(
details
.
documentation
);
...
...
extensions/package.json
浏览文件 @
bf993214
...
...
@@ -3,7 +3,7 @@
"version"
:
"0.0.1"
,
"description"
:
"Dependencies shared by all extensions"
,
"dependencies"
:
{
"typescript"
:
"2.
8.
3"
"typescript"
:
"2.
9.0-insiders.2018050
3"
},
"scripts"
:
{
"postinstall"
:
"node ./postinstall"
...
...
extensions/typescript-language-features/src/features/fileConfigurationManager.ts
浏览文件 @
bf993214
...
...
@@ -9,9 +9,6 @@ import * as Proto from '../protocol';
import
{
ITypeScriptServiceClient
}
from
'
../typescriptService
'
;
import
*
as
languageIds
from
'
../utils/languageModeIds
'
;
// TODO: for TS 2.8
type
UserPreferences
=
any
;
function
objsAreEqual
<
T
>
(
a
:
T
,
b
:
T
):
boolean
{
let
keys
=
Object
.
keys
(
a
);
for
(
let
i
=
0
;
i
<
keys
.
length
;
i
++
)
{
...
...
@@ -25,7 +22,7 @@ function objsAreEqual<T>(a: T, b: T): boolean {
interface
FileConfiguration
{
formatOptions
:
Proto
.
FormatCodeSettings
;
preferences
:
UserPreferences
;
preferences
:
Proto
.
UserPreferences
;
}
function
areFileConfigurationsEqual
(
a
:
FileConfiguration
,
b
:
FileConfiguration
):
boolean
{
...
...
@@ -146,7 +143,7 @@ export default class FileConfigurationManager {
};
}
private
getPreferences
(
document
:
TextDocument
):
UserPreferences
{
private
getPreferences
(
document
:
TextDocument
):
Proto
.
UserPreferences
{
if
(
!
this
.
client
.
apiVersion
.
has290Features
())
{
return
{};
}
...
...
extensions/typescript-language-features/src/features/quickFixProvider.ts
浏览文件 @
bf993214
...
...
@@ -201,16 +201,16 @@ export default class TypeScriptQuickFixProvider implements vscode.CodeActionProv
document
:
vscode
.
TextDocument
,
file
:
string
,
diagnostic
:
vscode
.
Diagnostic
,
tsAction
:
Proto
.
Code
Fix
Action
tsAction
:
Proto
.
CodeAction
):
Promise
<
Iterable
<
vscode
.
CodeAction
>>
{
const
singleFix
=
this
.
getSingleFixForTsCodeAction
(
diagnostic
,
tsAction
);
const
fixAll
=
await
this
.
getFixAllForTsCodeAction
(
document
,
file
,
diagnostic
,
tsAction
);
const
fixAll
=
await
this
.
getFixAllForTsCodeAction
(
document
,
file
,
diagnostic
,
tsAction
as
Proto
.
CodeFixAction
);
return
fixAll
?
[
singleFix
,
fixAll
]
:
[
singleFix
];
}
private
getSingleFixForTsCodeAction
(
diagnostic
:
vscode
.
Diagnostic
,
tsAction
:
Proto
.
Code
Fix
Action
tsAction
:
Proto
.
CodeAction
):
vscode
.
CodeAction
{
const
codeAction
=
new
vscode
.
CodeAction
(
tsAction
.
description
,
vscode
.
CodeActionKind
.
QuickFix
);
codeAction
.
edit
=
getEditForCodeAction
(
this
.
client
,
tsAction
);
...
...
extensions/yarn.lock
浏览文件 @
bf993214
...
...
@@ -2,6 +2,6 @@
# yarn lockfile v1
typescript@2.
8.
3:
version "2.
8.
3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.
8.3.tgz#5d817f9b6f31bb871835f4edf0089f21abe6c170
"
typescript@2.
9.0-insiders.2018050
3:
version "2.
9.0-insiders.2018050
3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.
9.0-insiders.20180503.tgz#dc5363403e7b384ad85b1a74a96412c36ea238a4
"
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录