Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
58d2b5be
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,发现更多精彩内容 >>
提交
58d2b5be
编写于
2月 13, 2019
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
disable event for now, remove extension location from provider
上级
302533f6
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
10 addition
and
13 deletion
+10
-13
src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts
...kbench/api/electron-browser/mainThreadLanguageFeatures.ts
+2
-4
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
+6
-6
src/vs/workbench/contrib/codeinset/codeInset.ts
src/vs/workbench/contrib/codeinset/codeInset.ts
+1
-2
未找到文件。
src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts
浏览文件 @
58d2b5be
...
@@ -20,7 +20,6 @@ import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostC
...
@@ -20,7 +20,6 @@ import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostC
import
*
as
typeConverters
from
'
vs/workbench/api/node/extHostTypeConverters
'
;
import
*
as
typeConverters
from
'
vs/workbench/api/node/extHostTypeConverters
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
{
Selection
}
from
'
vs/editor/common/core/selection
'
;
import
{
Selection
}
from
'
vs/editor/common/core/selection
'
;
import
{
IExtensionDescription
}
from
'
vs/workbench/services/extensions/common/extensions
'
;
import
*
as
codeInset
from
'
vs/workbench/contrib/codeinset/codeInset
'
;
import
*
as
codeInset
from
'
vs/workbench/contrib/codeinset/codeInset
'
;
@
extHostNamedCustomer
(
MainContext
.
MainThreadLanguageFeatures
)
@
extHostNamedCustomer
(
MainContext
.
MainThreadLanguageFeatures
)
...
@@ -164,7 +163,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
...
@@ -164,7 +163,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
// -- code inset
// -- code inset
$registerCodeInsetSupport
(
handle
:
number
,
selector
:
ISerializedDocumentFilter
[],
eventHandle
:
number
,
extension
:
IExtensionDescription
):
void
{
$registerCodeInsetSupport
(
handle
:
number
,
selector
:
ISerializedDocumentFilter
[],
eventHandle
:
number
):
void
{
const
provider
=
<
codeInset
.
CodeInsetProvider
>
{
const
provider
=
<
codeInset
.
CodeInsetProvider
>
{
provideCodeInsets
:
(
model
:
ITextModel
,
token
:
CancellationToken
):
CodeInsetDto
[]
|
Thenable
<
CodeInsetDto
[]
>
=>
{
provideCodeInsets
:
(
model
:
ITextModel
,
token
:
CancellationToken
):
CodeInsetDto
[]
|
Thenable
<
CodeInsetDto
[]
>
=>
{
...
@@ -178,8 +177,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
...
@@ -178,8 +177,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
this
.
_heapService
.
trackObject
(
obj
);
this
.
_heapService
.
trackObject
(
obj
);
return
obj
;
return
obj
;
});
});
},
}
extensionLocation
:
extension
.
extensionLocation
};
};
if
(
typeof
eventHandle
===
'
number
'
)
{
if
(
typeof
eventHandle
===
'
number
'
)
{
...
...
src/vs/workbench/api/node/extHost.protocol.ts
浏览文件 @
58d2b5be
...
@@ -300,7 +300,7 @@ export interface MainThreadLanguageFeaturesShape extends IDisposable {
...
@@ -300,7 +300,7 @@ export interface MainThreadLanguageFeaturesShape extends IDisposable {
$unregister
(
handle
:
number
):
void
;
$unregister
(
handle
:
number
):
void
;
$registerDocumentSymbolProvider
(
handle
:
number
,
selector
:
ISerializedDocumentFilter
[],
label
:
string
):
void
;
$registerDocumentSymbolProvider
(
handle
:
number
,
selector
:
ISerializedDocumentFilter
[],
label
:
string
):
void
;
$registerCodeLensSupport
(
handle
:
number
,
selector
:
ISerializedDocumentFilter
[],
eventHandle
:
number
|
undefined
):
void
;
$registerCodeLensSupport
(
handle
:
number
,
selector
:
ISerializedDocumentFilter
[],
eventHandle
:
number
|
undefined
):
void
;
$registerCodeInsetSupport
(
handle
:
number
,
selector
:
ISerializedDocumentFilter
[],
eventHandle
:
number
,
extension
:
IExtensionDescription
):
void
;
$registerCodeInsetSupport
(
handle
:
number
,
selector
:
ISerializedDocumentFilter
[],
eventHandle
:
number
):
void
;
$emitCodeLensEvent
(
eventHandle
:
number
,
event
?:
any
):
void
;
$emitCodeLensEvent
(
eventHandle
:
number
,
event
?:
any
):
void
;
$registerDefinitionSupport
(
handle
:
number
,
selector
:
ISerializedDocumentFilter
[]):
void
;
$registerDefinitionSupport
(
handle
:
number
,
selector
:
ISerializedDocumentFilter
[]):
void
;
$registerDeclarationSupport
(
handle
:
number
,
selector
:
ISerializedDocumentFilter
[]):
void
;
$registerDeclarationSupport
(
handle
:
number
,
selector
:
ISerializedDocumentFilter
[]):
void
;
...
...
src/vs/workbench/api/node/extHostLanguageFeatures.ts
浏览文件 @
58d2b5be
...
@@ -1134,16 +1134,16 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
...
@@ -1134,16 +1134,16 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
registerCodeInsetProvider
(
extension
:
IExtensionDescription
,
selector
:
vscode
.
DocumentSelector
,
provider
:
vscode
.
CodeInsetProvider
):
vscode
.
Disposable
{
registerCodeInsetProvider
(
extension
:
IExtensionDescription
,
selector
:
vscode
.
DocumentSelector
,
provider
:
vscode
.
CodeInsetProvider
):
vscode
.
Disposable
{
const
handle
=
this
.
_nextHandle
();
const
handle
=
this
.
_nextHandle
();
const
eventHandle
=
typeof
provider
.
onDidChangeCodeInsets
===
'
function
'
?
this
.
_nextHandle
()
:
undefined
;
//
const eventHandle = typeof provider.onDidChangeCodeInsets === 'function' ? this._nextHandle() : undefined;
this
.
_adapter
.
set
(
handle
,
new
AdapterData
(
new
CodeInsetAdapter
(
this
.
_documents
,
this
.
_heapService
,
provider
),
extension
));
this
.
_adapter
.
set
(
handle
,
new
AdapterData
(
new
CodeInsetAdapter
(
this
.
_documents
,
this
.
_heapService
,
provider
),
extension
));
this
.
_proxy
.
$registerCodeInsetSupport
(
handle
,
this
.
_transformDocumentSelector
(
selector
),
eventHandle
,
extension
);
this
.
_proxy
.
$registerCodeInsetSupport
(
handle
,
this
.
_transformDocumentSelector
(
selector
),
undefined
);
let
result
=
this
.
_createDisposable
(
handle
);
let
result
=
this
.
_createDisposable
(
handle
);
if
(
eventHandle
!==
undefined
)
{
//
if (eventHandle !== undefined) {
const
subscription
=
provider
.
onDidChangeCodeInsets
(
_
=>
this
.
_proxy
.
$emitCodeLensEvent
(
eventHandle
));
//
const subscription = provider.onDidChangeCodeInsets(_ => this._proxy.$emitCodeLensEvent(eventHandle));
result
=
Disposable
.
from
(
result
,
subscription
);
//
result = Disposable.from(result, subscription);
}
//
}
return
result
;
return
result
;
}
}
...
...
src/vs/workbench/contrib/codeinset/codeInset.ts
浏览文件 @
58d2b5be
...
@@ -7,7 +7,7 @@ import { registerLanguageCommand } from 'vs/editor/browser/editorExtensions';
...
@@ -7,7 +7,7 @@ import { registerLanguageCommand } from 'vs/editor/browser/editorExtensions';
import
{
ITextModel
}
from
'
vs/editor/common/model
'
;
import
{
ITextModel
}
from
'
vs/editor/common/model
'
;
import
{
onUnexpectedExternalError
,
illegalArgument
}
from
'
vs/base/common/errors
'
;
import
{
onUnexpectedExternalError
,
illegalArgument
}
from
'
vs/base/common/errors
'
;
import
{
mergeSort
}
from
'
vs/base/common/arrays
'
;
import
{
mergeSort
}
from
'
vs/base/common/arrays
'
;
import
{
URI
,
UriComponents
}
from
'
vs/base/common/uri
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
{
Event
}
from
'
vs/base/common/event
'
;
import
{
Event
}
from
'
vs/base/common/event
'
;
import
{
IModelService
}
from
'
vs/editor/common/services/modelService
'
;
import
{
IModelService
}
from
'
vs/editor/common/services/modelService
'
;
import
{
CancellationToken
}
from
'
vs/base/common/cancellation
'
;
import
{
CancellationToken
}
from
'
vs/base/common/cancellation
'
;
...
@@ -23,7 +23,6 @@ export interface ICodeInsetSymbol {
...
@@ -23,7 +23,6 @@ export interface ICodeInsetSymbol {
export
interface
CodeInsetProvider
{
export
interface
CodeInsetProvider
{
onDidChange
?:
Event
<
this
>
;
onDidChange
?:
Event
<
this
>
;
extensionLocation
:
UriComponents
;
provideCodeInsets
(
model
:
ITextModel
,
token
:
CancellationToken
):
ProviderResult
<
ICodeInsetSymbol
[]
>
;
provideCodeInsets
(
model
:
ITextModel
,
token
:
CancellationToken
):
ProviderResult
<
ICodeInsetSymbol
[]
>
;
resolveCodeInset
(
model
:
ITextModel
,
codeInset
:
ICodeInsetSymbol
,
token
:
CancellationToken
):
ProviderResult
<
ICodeInsetSymbol
>
;
resolveCodeInset
(
model
:
ITextModel
,
codeInset
:
ICodeInsetSymbol
,
token
:
CancellationToken
):
ProviderResult
<
ICodeInsetSymbol
>
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录