Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
e91573db
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,发现更多精彩内容 >>
提交
e91573db
编写于
8月 14, 2018
作者:
M
mechatroner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
cleanup and rename
上级
2eabbee4
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
9 addition
and
65 deletion
+9
-65
src/vs/vscode.d.ts
src/vs/vscode.d.ts
+1
-17
src/vs/workbench/api/electron-browser/mainThreadDocumentsAndEditors.ts
...nch/api/electron-browser/mainThreadDocumentsAndEditors.ts
+1
-1
src/vs/workbench/api/electron-browser/mainThreadEditors.ts
src/vs/workbench/api/electron-browser/mainThreadEditors.ts
+0
-24
src/vs/workbench/api/electron-browser/mainThreadLanguages.ts
src/vs/workbench/api/electron-browser/mainThreadLanguages.ts
+1
-1
src/vs/workbench/api/node/extHost.api.impl.ts
src/vs/workbench/api/node/extHost.api.impl.ts
+2
-2
src/vs/workbench/api/node/extHost.protocol.ts
src/vs/workbench/api/node/extHost.protocol.ts
+1
-3
src/vs/workbench/api/node/extHostLanguages.ts
src/vs/workbench/api/node/extHostLanguages.ts
+2
-2
src/vs/workbench/api/node/extHostTextEditor.ts
src/vs/workbench/api/node/extHostTextEditor.ts
+0
-8
src/vs/workbench/test/electron-browser/api/extHostTextEditor.test.ts
...bench/test/electron-browser/api/extHostTextEditor.test.ts
+0
-2
src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts
...bench/test/electron-browser/api/mainThreadEditors.test.ts
+1
-5
未找到文件。
src/vs/vscode.d.ts
浏览文件 @
e91573db
...
...
@@ -1119,21 +1119,6 @@ declare module 'vscode' {
*/
edit
(
callback
:
(
editBuilder
:
TextEditorEdit
)
=>
void
,
options
?:
{
undoStopBefore
:
boolean
;
undoStopAfter
:
boolean
;
}):
Thenable
<
boolean
>
;
/**
* Change document language by Id
*
* @param languageId new language identifier
*/
setLanguageById
(
languageId
:
string
):
void
;
/**
* Change document language by Name
*
* @param languageName new language name
*/
setLanguageByName
(
languageName
:
string
):
void
;
/**
* Insert a [snippet](#SnippetString) and put the editor into snippet mode. "Snippet mode"
* means the editor adds placeholders and additional cursors so that the user can complete
...
...
@@ -1156,7 +1141,6 @@ declare module 'vscode' {
* @param decorationType A decoration type.
* @param rangesOrOptions Either [ranges](#Range) or more detailed [options](#DecorationOptions).
*/
setDecorations
(
decorationType
:
TextEditorDecorationType
,
rangesOrOptions
:
Range
[]
|
DecorationOptions
[]):
void
;
/**
...
...
@@ -7391,7 +7375,7 @@ declare module 'vscode' {
*/
export
namespace
languages
{
export
function
setLanguageById
(
documentUri
:
Uri
,
languageId
:
string
):
Thenable
<
void
>
;
export
function
changeLanguage
(
documentUri
:
Uri
,
languageId
:
string
):
Thenable
<
void
>
;
/**
* Return the identifiers of all known languages.
...
...
src/vs/workbench/api/electron-browser/mainThreadDocumentsAndEditors.ts
浏览文件 @
e91573db
...
...
@@ -315,7 +315,7 @@ export class MainThreadDocumentsAndEditors {
const
mainThreadDocuments
=
new
MainThreadDocuments
(
this
,
extHostContext
,
this
.
_modelService
,
modeService
,
this
.
_textFileService
,
fileService
,
textModelResolverService
,
untitledEditorService
);
extHostContext
.
set
(
MainContext
.
MainThreadDocuments
,
mainThreadDocuments
);
const
mainThreadTextEditors
=
new
MainThreadTextEditors
(
this
,
extHostContext
,
this
.
_modelService
,
modeService
,
codeEditorService
,
bulkEditService
,
this
.
_editorService
,
this
.
_editorGroupService
);
const
mainThreadTextEditors
=
new
MainThreadTextEditors
(
this
,
extHostContext
,
codeEditorService
,
bulkEditService
,
this
.
_editorService
,
this
.
_editorGroupService
);
extHostContext
.
set
(
MainContext
.
MainThreadTextEditors
,
mainThreadTextEditors
);
// It is expected that the ctor of the state computer calls our `_onDelta`.
...
...
src/vs/workbench/api/electron-browser/mainThreadEditors.ts
浏览文件 @
e91573db
...
...
@@ -27,8 +27,6 @@ import { ExtHostContext, ExtHostEditorsShape, IExtHostContext, ITextDocumentShow
import
{
MainThreadDocumentsAndEditors
}
from
'
./mainThreadDocumentsAndEditors
'
;
import
{
MainThreadTextEditor
}
from
'
./mainThreadEditor
'
;
import
{
IOpenerService
}
from
'
vs/platform/opener/common/opener
'
;
import
{
IModeService
}
from
'
vs/editor/common/services/modeService
'
;
import
{
IModelService
}
from
'
vs/editor/common/services/modelService
'
;
export
class
MainThreadTextEditors
implements
MainThreadTextEditorsShape
{
...
...
@@ -45,8 +43,6 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
constructor
(
documentsAndEditors
:
MainThreadDocumentsAndEditors
,
extHostContext
:
IExtHostContext
,
@
IModelService
private
readonly
_modelService
:
IModelService
,
@
IModeService
private
readonly
_modeService
:
IModeService
,
@
ICodeEditorService
private
readonly
_codeEditorService
:
ICodeEditorService
,
@
IBulkEditService
private
readonly
_bulkEditService
:
IBulkEditService
,
@
IEditorService
private
readonly
_editorService
:
IEditorService
,
...
...
@@ -174,26 +170,6 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
return
TPromise
.
as
(
null
);
}
$trySetLanguageById
(
id
:
string
,
languageId
:
string
):
TPromise
<
void
>
{
let
mainThreadEditor
=
this
.
_documentsAndEditors
.
getEditor
(
id
);
if
(
!
mainThreadEditor
)
{
return
TPromise
.
wrapError
(
disposed
(
`TextEditor(
${
id
}
)`
));
}
let
mode
=
this
.
_modeService
.
getOrCreateModeByLanguageId
(
languageId
);
this
.
_modelService
.
setMode
(
mainThreadEditor
.
getModel
(),
mode
);
return
TPromise
.
as
(
null
);
}
$trySetLanguageByName
(
id
:
string
,
languageName
:
string
):
TPromise
<
void
>
{
let
mainThreadEditor
=
this
.
_documentsAndEditors
.
getEditor
(
id
);
if
(
!
mainThreadEditor
)
{
return
TPromise
.
wrapError
(
disposed
(
`TextEditor(
${
id
}
)`
));
}
let
mode
=
this
.
_modeService
.
getOrCreateModeByLanguageName
(
languageName
);
this
.
_modelService
.
setMode
(
mainThreadEditor
.
getModel
(),
mode
);
return
TPromise
.
as
(
null
);
}
$trySetDecorations
(
id
:
string
,
key
:
string
,
ranges
:
IDecorationOptions
[]):
TPromise
<
void
>
{
key
=
`
${
this
.
_instanceId
}
-
${
key
}
`
;
if
(
!
this
.
_documentsAndEditors
.
getEditor
(
id
))
{
...
...
src/vs/workbench/api/electron-browser/mainThreadLanguages.ts
浏览文件 @
e91573db
...
...
@@ -33,7 +33,7 @@ export class MainThreadLanguages implements MainThreadLanguagesShape {
return
TPromise
.
as
(
this
.
_modeService
.
getRegisteredModes
());
}
$
setLanguageById
(
resource
:
UriComponents
,
languageId
:
string
):
TPromise
<
void
>
{
$
changeLanguage
(
resource
:
UriComponents
,
languageId
:
string
):
TPromise
<
void
>
{
const
uri
=
URI
.
revive
(
resource
);
let
model
=
this
.
_modelService
.
getModel
(
uri
);
if
(
!
model
)
{
...
...
src/vs/workbench/api/node/extHost.api.impl.ts
浏览文件 @
e91573db
...
...
@@ -258,8 +258,8 @@ export function createApiFactory(
getLanguages
():
TPromise
<
string
[]
>
{
return
extHostLanguages
.
getLanguages
();
},
setLanguageById
(
documentUri
:
vscode
.
Uri
,
languageId
:
string
):
TPromise
<
void
>
{
return
extHostLanguages
.
setLanguageById
(
documentUri
,
languageId
);
changeLanguage
(
documentUri
:
vscode
.
Uri
,
languageId
:
string
):
TPromise
<
void
>
{
return
extHostLanguages
.
changeLanguage
(
documentUri
,
languageId
);
},
match
(
selector
:
vscode
.
DocumentSelector
,
document
:
vscode
.
TextDocument
):
number
{
return
score
(
typeConverters
.
LanguageSelector
.
from
(
selector
),
document
.
uri
,
document
.
languageId
,
true
);
...
...
src/vs/workbench/api/node/extHost.protocol.ts
浏览文件 @
e91573db
...
...
@@ -193,8 +193,6 @@ export interface MainThreadTextEditorsShape extends IDisposable {
$tryShowEditor
(
id
:
string
,
position
:
EditorViewColumn
):
TPromise
<
void
>
;
$tryHideEditor
(
id
:
string
):
TPromise
<
void
>
;
$trySetOptions
(
id
:
string
,
options
:
ITextEditorConfigurationUpdate
):
TPromise
<
void
>
;
$trySetLanguageById
(
id
:
string
,
languageId
:
string
):
TPromise
<
void
>
;
$trySetLanguageByName
(
id
:
string
,
languageName
:
string
):
TPromise
<
void
>
;
$trySetDecorations
(
id
:
string
,
key
:
string
,
ranges
:
editorCommon
.
IDecorationOptions
[]):
TPromise
<
void
>
;
$trySetDecorationsFast
(
id
:
string
,
key
:
string
,
ranges
:
number
[]):
TPromise
<
void
>
;
$tryRevealRange
(
id
:
string
,
range
:
IRange
,
revealType
:
TextEditorRevealType
):
TPromise
<
void
>
;
...
...
@@ -289,7 +287,7 @@ export interface MainThreadLanguageFeaturesShape extends IDisposable {
export
interface
MainThreadLanguagesShape
extends
IDisposable
{
$getLanguages
():
TPromise
<
string
[]
>
;
$
setLanguageById
(
resource
:
UriComponents
,
languageId
:
string
):
TPromise
<
void
>
;
$
changeLanguage
(
resource
:
UriComponents
,
languageId
:
string
):
TPromise
<
void
>
;
}
export
interface
MainThreadMessageOptions
{
...
...
src/vs/workbench/api/node/extHostLanguages.ts
浏览文件 @
e91573db
...
...
@@ -21,7 +21,7 @@ export class ExtHostLanguages {
getLanguages
():
TPromise
<
string
[]
>
{
return
this
.
_proxy
.
$getLanguages
();
}
setLanguageById
(
documentUri
:
vscode
.
Uri
,
languageId
:
string
):
TPromise
<
void
>
{
return
this
.
_proxy
.
$
setLanguageById
(
documentUri
,
languageId
);
changeLanguage
(
documentUri
:
vscode
.
Uri
,
languageId
:
string
):
TPromise
<
void
>
{
return
this
.
_proxy
.
$
changeLanguage
(
documentUri
,
languageId
);
}
}
src/vs/workbench/api/node/extHostTextEditor.ts
浏览文件 @
e91573db
...
...
@@ -435,14 +435,6 @@ export class ExtHostTextEditor implements vscode.TextEditor {
this
.
_trySetSelection
();
}
setLanguageById
(
languageId
:
string
):
void
{
this
.
_runOnProxy
(()
=>
this
.
_proxy
.
$trySetLanguageById
(
this
.
_id
,
languageId
));
}
setLanguageByName
(
languageName
:
string
):
void
{
this
.
_runOnProxy
(()
=>
this
.
_proxy
.
$trySetLanguageByName
(
this
.
_id
,
languageName
));
}
setDecorations
(
decorationType
:
vscode
.
TextEditorDecorationType
,
ranges
:
Range
[]
|
vscode
.
DecorationOptions
[]):
void
{
this
.
_runOnProxy
(
()
=>
{
...
...
src/vs/workbench/test/electron-browser/api/extHostTextEditor.test.ts
浏览文件 @
e91573db
...
...
@@ -60,8 +60,6 @@ suite('ExtHostTextEditorOptions', () => {
$removeTextEditorDecorationType
:
undefined
,
$tryShowEditor
:
undefined
,
$tryHideEditor
:
undefined
,
$trySetLanguageById
:
undefined
,
$trySetLanguageByName
:
undefined
,
$trySetDecorations
:
undefined
,
$trySetDecorationsFast
:
undefined
,
$tryRevealRange
:
undefined
,
...
...
src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts
浏览文件 @
e91573db
...
...
@@ -94,15 +94,13 @@ suite('MainThreadEditors', () => {
}
});
const
emptyModeService
=
null
;
const
documentAndEditor
=
new
MainThreadDocumentsAndEditors
(
rpcProtocol
,
modelService
,
textFileService
,
workbenchEditorService
,
codeEditorService
,
emptyModeService
,
null
,
fileService
,
null
,
null
,
...
...
@@ -113,8 +111,6 @@ suite('MainThreadEditors', () => {
editors
=
new
MainThreadTextEditors
(
documentAndEditor
,
SingleProxyRPCProtocol
(
null
),
modelService
,
emptyModeService
,
codeEditorService
,
bulkEditService
,
workbenchEditorService
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录