Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
cffe0d63
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,发现更多精彩内容 >>
提交
cffe0d63
编写于
3月 20, 2019
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
move mainThreadConsole, #70319
上级
2f157c7e
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
35 addition
and
27 deletion
+35
-27
src/vs/workbench/api/browser/mainThreadConsole.ts
src/vs/workbench/api/browser/mainThreadConsole.ts
+1
-1
src/vs/workbench/api/electron-browser/extensionHost.contribution.ts
...kbench/api/electron-browser/extensionHost.contribution.ts
+3
-3
src/vs/workbench/services/extensions/common/extensionDevOptions.ts
...rkbench/services/extensions/common/extensionDevOptions.ts
+30
-0
src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
...nch/services/extensions/electron-browser/extensionHost.ts
+1
-23
未找到文件。
src/vs/workbench/api/
electron-
browser/mainThreadConsole.ts
→
src/vs/workbench/api/browser/mainThreadConsole.ts
浏览文件 @
cffe0d63
...
...
@@ -7,7 +7,7 @@ import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
import
{
MainContext
,
MainThreadConsoleShape
,
IExtHostContext
}
from
'
vs/workbench/api/common/extHost.protocol
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
IRemoteConsoleLog
,
log
,
parse
}
from
'
vs/base/common/console
'
;
import
{
parseExtensionDevOptions
}
from
'
vs/workbench/services/extensions/
electron-browser/extensionHost
'
;
import
{
parseExtensionDevOptions
}
from
'
vs/workbench/services/extensions/
common/extensionDevOptions
'
;
import
{
IWindowsService
}
from
'
vs/platform/windows/common/windows
'
;
import
{
IBroadcastService
}
from
'
vs/workbench/services/broadcast/common/broadcast
'
;
import
{
EXTENSION_LOG_BROADCAST_CHANNEL
}
from
'
vs/platform/extensions/common/extensionHost
'
;
...
...
src/vs/workbench/api/electron-browser/extensionHost.contribution.ts
浏览文件 @
cffe0d63
...
...
@@ -17,6 +17,7 @@ import { LanguageConfigurationFileHandler } from 'vs/workbench/contrib/codeEdito
import
'
../browser/mainThreadClipboard
'
;
import
'
../browser/mainThreadCommands
'
;
import
'
../browser/mainThreadConfiguration
'
;
import
'
../browser/mainThreadConsole
'
;
import
'
../browser/mainThreadDebugService
'
;
import
'
../browser/mainThreadDecorations
'
;
import
'
../browser/mainThreadDiagnostics
'
;
...
...
@@ -27,11 +28,12 @@ import '../browser/mainThreadDocumentsAndEditors';
import
'
../browser/mainThreadEditor
'
;
import
'
../browser/mainThreadEditors
'
;
import
'
../browser/mainThreadErrors
'
;
import
'
../browser/mainThreadExtensionService
'
;
import
'
../browser/mainThreadFileSystem
'
;
import
'
../browser/mainThreadFileSystemEventService
'
;
import
'
../browser/mainThreadHeapService
'
;
import
'
../browser/mainThreadLanguages
'
;
import
'
../browser/mainThreadLanguageFeatures
'
;
import
'
../browser/mainThreadLanguages
'
;
import
'
../browser/mainThreadLogService
'
;
import
'
../browser/mainThreadMessageService
'
;
import
'
../browser/mainThreadOutputService
'
;
...
...
@@ -49,8 +51,6 @@ import '../browser/mainThreadUrls';
import
'
../browser/mainThreadWindow
'
;
import
'
../browser/mainThreadWorkspace
'
;
import
'
./mainThreadComments
'
;
import
'
./mainThreadConsole
'
;
import
'
../browser/mainThreadExtensionService
'
;
import
'
./mainThreadTask
'
;
import
'
./mainThreadWebview
'
;
import
'
vs/workbench/api/node/apiCommands
'
;
...
...
src/vs/workbench/services/extensions/common/extensionDevOptions.ts
0 → 100644
浏览文件 @
cffe0d63
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import
{
Schemas
}
from
'
vs/base/common/network
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
export
interface
IExtensionDevOptions
{
readonly
isExtensionDevHost
:
boolean
;
readonly
isExtensionDevDebug
:
boolean
;
readonly
isExtensionDevDebugBrk
:
boolean
;
readonly
isExtensionDevTestFromCli
:
boolean
;
}
export
function
parseExtensionDevOptions
(
environmentService
:
IEnvironmentService
):
IExtensionDevOptions
{
// handle extension host lifecycle a bit special when we know we are developing an extension that runs inside
let
isExtensionDevHost
=
environmentService
.
isExtensionDevelopment
;
const
extDevLoc
=
environmentService
.
extensionDevelopmentLocationURI
;
const
debugOk
=
!
extDevLoc
||
extDevLoc
.
scheme
===
Schemas
.
file
;
let
isExtensionDevDebug
=
debugOk
&&
typeof
environmentService
.
debugExtensionHost
.
port
===
'
number
'
;
let
isExtensionDevDebugBrk
=
debugOk
&&
!!
environmentService
.
debugExtensionHost
.
break
;
let
isExtensionDevTestFromCli
=
isExtensionDevHost
&&
!!
environmentService
.
extensionTestsLocationURI
&&
!
environmentService
.
debugExtensionHost
.
break
;
return
{
isExtensionDevHost
,
isExtensionDevDebug
,
isExtensionDevDebugBrk
,
isExtensionDevTestFromCli
,
};
}
src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
浏览文件 @
cffe0d63
...
...
@@ -12,7 +12,6 @@ import { timeout } from 'vs/base/common/async';
import
{
toErrorMessage
}
from
'
vs/base/common/errorMessage
'
;
import
{
Emitter
,
Event
}
from
'
vs/base/common/event
'
;
import
{
IDisposable
,
dispose
,
toDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
Schemas
}
from
'
vs/base/common/network
'
;
import
*
as
objects
from
'
vs/base/common/objects
'
;
import
{
isWindows
}
from
'
vs/base/common/platform
'
;
import
{
isEqual
}
from
'
vs/base/common/resources
'
;
...
...
@@ -36,6 +35,7 @@ import { IInitData } from 'vs/workbench/api/common/extHost.protocol';
import
{
MessageType
,
createMessageOfType
,
isMessageOfType
}
from
'
vs/workbench/services/extensions/node/extensionHostProtocol
'
;
import
{
withNullAsUndefined
}
from
'
vs/base/common/types
'
;
import
{
IExtensionDescription
}
from
'
vs/platform/extensions/common/extensions
'
;
import
{
parseExtensionDevOptions
}
from
'
../common/extensionDevOptions
'
;
export
interface
IExtensionHostStarter
{
readonly
onCrashed
:
Event
<
[
number
,
string
|
null
]
>
;
...
...
@@ -44,28 +44,6 @@ export interface IExtensionHostStarter {
dispose
():
void
;
}
export
interface
IExtensionDevOptions
{
readonly
isExtensionDevHost
:
boolean
;
readonly
isExtensionDevDebug
:
boolean
;
readonly
isExtensionDevDebugBrk
:
boolean
;
readonly
isExtensionDevTestFromCli
:
boolean
;
}
export
function
parseExtensionDevOptions
(
environmentService
:
IEnvironmentService
):
IExtensionDevOptions
{
// handle extension host lifecycle a bit special when we know we are developing an extension that runs inside
let
isExtensionDevHost
=
environmentService
.
isExtensionDevelopment
;
const
extDevLoc
=
environmentService
.
extensionDevelopmentLocationURI
;
const
debugOk
=
!
extDevLoc
||
extDevLoc
.
scheme
===
Schemas
.
file
;
let
isExtensionDevDebug
=
debugOk
&&
typeof
environmentService
.
debugExtensionHost
.
port
===
'
number
'
;
let
isExtensionDevDebugBrk
=
debugOk
&&
!!
environmentService
.
debugExtensionHost
.
break
;
let
isExtensionDevTestFromCli
=
isExtensionDevHost
&&
!!
environmentService
.
extensionTestsLocationURI
&&
!
environmentService
.
debugExtensionHost
.
break
;
return
{
isExtensionDevHost
,
isExtensionDevDebug
,
isExtensionDevDebugBrk
,
isExtensionDevTestFromCli
,
};
}
export
class
ExtensionHostProcessWorker
implements
IExtensionHostStarter
{
private
readonly
_onCrashed
:
Emitter
<
[
number
,
string
]
>
=
new
Emitter
<
[
number
,
string
]
>
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录