Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
e9d92ca9
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,发现更多精彩内容 >>
提交
e9d92ca9
编写于
3月 13, 2018
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
align names, add RenameContext-type #7340
上级
dfc0aa1b
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
50 addition
and
37 deletion
+50
-37
src/vs/editor/common/modes.ts
src/vs/editor/common/modes.ts
+2
-2
src/vs/editor/contrib/rename/rename.ts
src/vs/editor/contrib/rename/rename.ts
+5
-5
src/vs/monaco.d.ts
src/vs/monaco.d.ts
+2
-2
src/vs/vscode.proposed.d.ts
src/vs/vscode.proposed.d.ts
+12
-6
src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts
...kbench/api/electron-browser/mainThreadLanguageFeatures.ts
+2
-2
src/vs/workbench/api/node/extHost.api.impl.ts
src/vs/workbench/api/node/extHost.api.impl.ts
+1
-0
src/vs/workbench/api/node/extHost.protocol.ts
src/vs/workbench/api/node/extHost.protocol.ts
+1
-1
src/vs/workbench/api/node/extHostLanguageFeatures.ts
src/vs/workbench/api/node/extHostLanguageFeatures.ts
+14
-18
src/vs/workbench/api/node/extHostTypes.ts
src/vs/workbench/api/node/extHostTypes.ts
+11
-1
未找到文件。
src/vs/editor/common/modes.ts
浏览文件 @
e9d92ca9
...
...
@@ -917,14 +917,14 @@ export interface WorkspaceEdit {
rejectReason
?:
string
;
// TODO@joh, move to rename
}
export
interface
Rename
Information
{
export
interface
Rename
Context
{
range
:
IRange
;
text
:
string
;
}
export
interface
RenameProvider
{
provideRenameEdits
(
model
:
model
.
ITextModel
,
position
:
Position
,
newName
:
string
,
token
:
CancellationToken
):
WorkspaceEdit
|
Thenable
<
WorkspaceEdit
>
;
resolve
InitialRenameValue
?(
model
:
model
.
ITextModel
,
position
:
Position
,
token
:
CancellationToken
):
RenameInformation
|
Thenable
<
RenameInformation
>
;
resolve
RenameContext
?(
model
:
model
.
ITextModel
,
position
:
Position
,
token
:
CancellationToken
):
RenameContext
|
Thenable
<
RenameContext
>
;
}
...
...
src/vs/editor/contrib/rename/rename.ts
浏览文件 @
e9d92ca9
...
...
@@ -23,7 +23,7 @@ import { ITextModelService } from 'vs/editor/common/services/resolverService';
import
{
optional
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
IThemeService
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
asWinJsPromise
}
from
'
vs/base/common/async
'
;
import
{
WorkspaceEdit
,
RenameProviderRegistry
,
Rename
Information
,
RenameProvider
}
from
'
vs/editor/common/modes
'
;
import
{
WorkspaceEdit
,
RenameProviderRegistry
,
Rename
Context
,
RenameProvider
}
from
'
vs/editor/common/modes
'
;
import
{
Position
}
from
'
vs/editor/common/core/position
'
;
import
{
alert
}
from
'
vs/base/browser/ui/aria/aria
'
;
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
...
...
@@ -47,13 +47,13 @@ class RenameSkeleton {
return
this
.
_provider
.
length
>
0
;
}
async
resolveRenameInformation
():
TPromise
<
Rename
Information
>
{
async
resolveRenameInformation
():
TPromise
<
Rename
Context
>
{
let
[
provider
]
=
this
.
_provider
;
let
information
:
Rename
Information
;
let
information
:
Rename
Context
;
if
(
provider
.
resolve
InitialRenameValue
)
{
information
=
await
asWinJsPromise
(
token
=>
provider
.
resolve
InitialRenameValue
(
this
.
model
,
this
.
position
,
token
));
if
(
provider
.
resolve
RenameContext
)
{
information
=
await
asWinJsPromise
(
token
=>
provider
.
resolve
RenameContext
(
this
.
model
,
this
.
position
,
token
));
}
if
(
!
information
)
{
...
...
src/vs/monaco.d.ts
浏览文件 @
e9d92ca9
...
...
@@ -4964,14 +4964,14 @@ declare module monaco.languages {
rejectReason
?:
string
;
}
export
interface
Rename
Information
{
export
interface
Rename
Context
{
range
:
IRange
;
text
:
string
;
}
export
interface
RenameProvider
{
provideRenameEdits
(
model
:
editor
.
ITextModel
,
position
:
Position
,
newName
:
string
,
token
:
CancellationToken
):
WorkspaceEdit
|
Thenable
<
WorkspaceEdit
>
;
resolve
InitialRenameValue
?(
model
:
editor
.
ITextModel
,
position
:
Position
,
token
:
CancellationToken
):
RenameInformation
|
Thenable
<
RenameInformation
>
;
resolve
RenameContext
?(
model
:
editor
.
ITextModel
,
position
:
Position
,
token
:
CancellationToken
):
RenameContext
|
Thenable
<
RenameContext
>
;
}
export
interface
Command
{
...
...
src/vs/vscode.proposed.d.ts
浏览文件 @
e9d92ca9
...
...
@@ -348,9 +348,18 @@ declare module 'vscode' {
logger
:
Logger
;
}
export
interface
RenameInitialValue
{
export
class
RenameContext
{
range
:
Range
;
text
?:
string
;
newName
?:
string
;
constructor
(
range
:
Range
,
newName
?:
string
);
}
export
interface
RenameProvider2
extends
RenameProvider
{
/**
* Optional function to resolve and validate a rename location.
*/
resolveRenameContext
?(
document
:
TextDocument
,
position
:
Position
,
token
:
CancellationToken
):
ProviderResult
<
RenameContext
>
;
}
export
namespace
languages
{
...
...
@@ -367,11 +376,8 @@ declare module 'vscode' {
* @return A [disposable](#Disposable) that unregisters this provider when being disposed.
*/
export
function
registerFoldingProvider
(
selector
:
DocumentSelector
,
provider
:
FoldingProvider
):
Disposable
;
export
interface
RenameProvider2
extends
RenameProvider
{
resolveInitialRenameValue
?(
document
:
TextDocument
,
position
:
Position
,
token
:
CancellationToken
):
ProviderResult
<
RenameInitialValue
>
;
}
}
export
interface
FoldingProvider
{
/**
* Returns a list of folding ranges or null if the provider does not want to participate or was cancelled.
...
...
src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts
浏览文件 @
e9d92ca9
...
...
@@ -256,8 +256,8 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
provideRenameEdits
:
(
model
:
ITextModel
,
position
:
EditorPosition
,
newName
:
string
,
token
:
CancellationToken
):
Thenable
<
modes
.
WorkspaceEdit
>
=>
{
return
wireCancellationToken
(
token
,
this
.
_proxy
.
$provideRenameEdits
(
handle
,
model
.
uri
,
position
,
newName
)).
then
(
reviveWorkspaceEditDto
);
},
resolve
InitialRenameValue
:
supportsResolveInitialValues
?
(
model
:
ITextModel
,
position
:
EditorPosition
,
token
:
CancellationToken
):
Thenable
<
modes
.
Rename
Information
>
=>
wireCancellationToken
(
token
,
this
.
_proxy
.
$resolveInitialRenameValue
(
handle
,
model
.
uri
,
position
))
resolve
RenameContext
:
supportsResolveInitialValues
?
(
model
:
ITextModel
,
position
:
EditorPosition
,
token
:
CancellationToken
):
Thenable
<
modes
.
Rename
Context
>
=>
wireCancellationToken
(
token
,
this
.
_proxy
.
$resolveRenameContext
(
handle
,
model
.
uri
,
position
))
:
undefined
});
}
...
...
src/vs/workbench/api/node/extHost.api.impl.ts
浏览文件 @
e9d92ca9
...
...
@@ -608,6 +608,7 @@ export function createApiFactory(
ParameterInformation
:
extHostTypes
.
ParameterInformation
,
Position
:
extHostTypes
.
Position
,
Range
:
extHostTypes
.
Range
,
RenameContext
:
extHostTypes
.
RenameContext
,
Selection
:
extHostTypes
.
Selection
,
SignatureHelp
:
extHostTypes
.
SignatureHelp
,
SignatureInformation
:
extHostTypes
.
SignatureInformation
,
...
...
src/vs/workbench/api/node/extHost.protocol.ts
浏览文件 @
e9d92ca9
...
...
@@ -692,7 +692,7 @@ export interface ExtHostLanguageFeaturesShape {
$resolveWorkspaceSymbol
(
handle
:
number
,
symbol
:
SymbolInformationDto
):
TPromise
<
SymbolInformationDto
>
;
$releaseWorkspaceSymbols
(
handle
:
number
,
id
:
number
):
void
;
$provideRenameEdits
(
handle
:
number
,
resource
:
UriComponents
,
position
:
IPosition
,
newName
:
string
):
TPromise
<
WorkspaceEditDto
>
;
$resolve
InitialRenameValue
(
handle
:
number
,
resource
:
UriComponents
,
position
:
IPosition
):
TPromise
<
modes
.
RenameInformation
>
;
$resolve
RenameContext
(
handle
:
number
,
resource
:
UriComponents
,
position
:
IPosition
):
TPromise
<
modes
.
RenameContext
>
;
$provideCompletionItems
(
handle
:
number
,
resource
:
UriComponents
,
position
:
IPosition
,
context
:
modes
.
SuggestContext
):
TPromise
<
SuggestResultDto
>
;
$resolveCompletionItem
(
handle
:
number
,
resource
:
UriComponents
,
position
:
IPosition
,
suggestion
:
modes
.
ISuggestion
):
TPromise
<
modes
.
ISuggestion
>
;
$releaseCompletionItems
(
handle
:
number
,
id
:
number
):
void
;
...
...
src/vs/workbench/api/node/extHostLanguageFeatures.ts
浏览文件 @
e9d92ca9
...
...
@@ -468,20 +468,16 @@ class NavigateTypeAdapter {
}
}
interface
RenameProvider2
extends
vscode
.
RenameProvider
{
resolveInitialRenameValue
?(
document
:
vscode
.
TextDocument
,
position
:
vscode
.
Position
,
token
:
vscode
.
CancellationToken
):
vscode
.
ProviderResult
<
vscode
.
RenameInitialValue
>
;
}
class
RenameAdapter
{
static
supportsResolving
(
provider
:
RenameProvider2
):
boolean
{
return
typeof
provider
.
resolve
InitialRenameValue
===
'
function
'
;
static
supportsResolving
(
provider
:
vscode
.
RenameProvider2
):
boolean
{
return
typeof
provider
.
resolve
RenameContext
===
'
function
'
;
}
private
_documents
:
ExtHostDocuments
;
private
_provider
:
RenameProvider2
;
private
_provider
:
vscode
.
RenameProvider2
;
constructor
(
documents
:
ExtHostDocuments
,
provider
:
RenameProvider2
)
{
constructor
(
documents
:
ExtHostDocuments
,
provider
:
vscode
.
RenameProvider2
)
{
this
.
_documents
=
documents
;
this
.
_provider
=
provider
;
}
...
...
@@ -514,25 +510,25 @@ class RenameAdapter {
});
}
resolve
InitialRenameValue
(
resource
:
URI
,
position
:
IPosition
):
TPromise
<
modes
.
RenameInformation
>
{
if
(
typeof
this
.
_provider
.
resolve
InitialRenameValue
!==
'
function
'
)
{
resolve
RenameContext
(
resource
:
URI
,
position
:
IPosition
):
TPromise
<
modes
.
RenameContext
>
{
if
(
typeof
this
.
_provider
.
resolve
RenameContext
!==
'
function
'
)
{
return
TPromise
.
as
(
undefined
);
}
let
doc
=
this
.
_documents
.
getDocumentData
(
resource
).
document
;
let
pos
=
TypeConverters
.
toPosition
(
position
);
return
asWinJsPromise
(
token
=>
this
.
_provider
.
resolve
InitialRenameValue
(
doc
,
pos
,
token
)).
then
(
value
=>
{
if
(
!
value
)
{
return
asWinJsPromise
(
token
=>
this
.
_provider
.
resolve
RenameContext
(
doc
,
pos
,
token
)).
then
(
context
=>
{
if
(
!
context
)
{
return
undefined
;
}
if
(
!
value
.
range
.
contains
(
pos
))
{
if
(
!
context
.
range
.
contains
(
pos
))
{
console
.
warn
(
'
INVALID rename information, must contain the request-position
'
);
return
undefined
;
}
return
<
modes
.
Rename
Information
>
{
range
:
TypeConverters
.
fromRange
(
value
.
range
),
text
:
value
.
text
||
doc
.
getText
(
value
.
range
)
return
<
modes
.
Rename
Context
>
{
range
:
TypeConverters
.
fromRange
(
context
.
range
),
text
:
context
.
newName
||
doc
.
getText
(
context
.
range
)
};
});
}
...
...
@@ -1068,8 +1064,8 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
return
this
.
_withAdapter
(
handle
,
RenameAdapter
,
adapter
=>
adapter
.
provideRenameEdits
(
URI
.
revive
(
resource
),
position
,
newName
));
}
$resolve
InitialRenameValue
(
handle
:
number
,
resource
:
URI
,
position
:
IPosition
):
TPromise
<
modes
.
RenameInformation
>
{
return
this
.
_withAdapter
(
handle
,
RenameAdapter
,
adapter
=>
adapter
.
resolve
InitialRenameValue
(
resource
,
position
));
$resolve
RenameContext
(
handle
:
number
,
resource
:
URI
,
position
:
IPosition
):
TPromise
<
modes
.
RenameContext
>
{
return
this
.
_withAdapter
(
handle
,
RenameAdapter
,
adapter
=>
adapter
.
resolve
RenameContext
(
resource
,
position
));
}
// --- suggestion
...
...
src/vs/workbench/api/node/extHostTypes.ts
浏览文件 @
e9d92ca9
...
...
@@ -591,6 +591,16 @@ export class WorkspaceEdit implements vscode.WorkspaceEdit {
}
}
export
class
RenameContext
{
range
:
Range
;
newName
?:
string
;
constructor
(
range
:
Range
,
newName
?:
string
)
{
this
.
range
=
range
;
this
.
newName
=
newName
;
}
}
export
class
SnippetString
{
static
isSnippetString
(
thing
:
any
):
thing
is
SnippetString
{
...
...
@@ -1754,4 +1764,4 @@ export enum FoldingRangeType {
Region
=
'
region
'
}
//#endregion
\ No newline at end of file
//#endregion
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录