Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
3b9db3df
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,发现更多精彩内容 >>
提交
3b9db3df
编写于
7月 20, 2020
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Extract NodeLogDirectoryProvider to electron specific file
上级
00bd63c3
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
57 addition
and
42 deletion
+57
-42
extensions/typescript-language-features/src/extension.ts
extensions/typescript-language-features/src/extension.ts
+2
-2
extensions/typescript-language-features/src/lazyClientHost.ts
...nsions/typescript-language-features/src/lazyClientHost.ts
+2
-2
extensions/typescript-language-features/src/tsServer/spawner.ts
...ions/typescript-language-features/src/tsServer/spawner.ts
+2
-2
extensions/typescript-language-features/src/typeScriptServiceClientHost.ts
...ript-language-features/src/typeScriptServiceClientHost.ts
+2
-2
extensions/typescript-language-features/src/typescriptServiceClient.ts
...pescript-language-features/src/typescriptServiceClient.ts
+2
-2
extensions/typescript-language-features/src/utils/logDirectoryProvider.electron.ts
...guage-features/src/utils/logDirectoryProvider.electron.ts
+41
-0
extensions/typescript-language-features/src/utils/logDirectoryProvider.ts
...cript-language-features/src/utils/logDirectoryProvider.ts
+6
-32
未找到文件。
extensions/typescript-language-features/src/extension.ts
浏览文件 @
3b9db3df
...
...
@@ -5,6 +5,7 @@
import
*
as
rimraf
from
'
rimraf
'
;
import
*
as
vscode
from
'
vscode
'
;
import
{
NodeLogDirectoryProvider
}
from
'
./utils/logDirectoryProvider.electron
'
;
import
{
Api
,
getExtensionApi
}
from
'
./api
'
;
import
{
registerCommands
}
from
'
./commands/index
'
;
import
{
LanguageConfigurationManager
}
from
'
./features/languageConfiguration
'
;
...
...
@@ -12,7 +13,6 @@ import * as task from './features/task';
import
{
createLazyClientHost
,
lazilyActivateClient
}
from
'
./lazyClientHost
'
;
import
{
CommandManager
}
from
'
./utils/commandManager
'
;
import
*
as
electron
from
'
./utils/electron
'
;
import
LogDirectoryProvider
from
'
./utils/logDirectoryProvider
'
;
import
{
PluginManager
}
from
'
./utils/plugins
'
;
export
function
activate
(
...
...
@@ -27,7 +27,7 @@ export function activate(
const
onCompletionAccepted
=
new
vscode
.
EventEmitter
<
vscode
.
CompletionItem
>
();
context
.
subscriptions
.
push
(
onCompletionAccepted
);
const
logDirectoryProvider
=
new
LogDirectoryProvider
(
context
);
const
logDirectoryProvider
=
new
Node
LogDirectoryProvider
(
context
);
const
lazyClientHost
=
createLazyClientHost
(
context
,
pluginManager
,
commandManager
,
logDirectoryProvider
,
item
=>
{
onCompletionAccepted
.
fire
(
item
);
...
...
extensions/typescript-language-features/src/lazyClientHost.ts
浏览文件 @
3b9db3df
...
...
@@ -11,7 +11,7 @@ import * as fileSchemes from './utils/fileSchemes';
import
{
standardLanguageDescriptions
}
from
'
./utils/languageDescription
'
;
import
*
as
ProjectStatus
from
'
./utils/largeProjectStatus
'
;
import
{
lazy
,
Lazy
}
from
'
./utils/lazy
'
;
import
LogDirectoryProvider
from
'
./utils/logDirectoryProvider
'
;
import
{
ILogDirectoryProvider
}
from
'
./utils/logDirectoryProvider
'
;
import
ManagedFileContextManager
from
'
./utils/managedFileContext
'
;
import
{
PluginManager
}
from
'
./utils/plugins
'
;
...
...
@@ -19,7 +19,7 @@ export function createLazyClientHost(
context
:
vscode
.
ExtensionContext
,
pluginManager
:
PluginManager
,
commandManager
:
CommandManager
,
logDirectoryProvider
:
LogDirectoryProvider
,
logDirectoryProvider
:
I
LogDirectoryProvider
,
onCompletionAccepted
:
(
item
:
vscode
.
CompletionItem
)
=>
void
,
):
Lazy
<
TypeScriptServiceClientHost
>
{
return
lazy
(()
=>
{
...
...
extensions/typescript-language-features/src/tsServer/spawner.ts
浏览文件 @
3b9db3df
...
...
@@ -9,7 +9,7 @@ import { ClientCapabilities, ClientCapability } from '../typescriptService';
import
API
from
'
../utils/api
'
;
import
{
SeparateSyntaxServerConfiguration
,
TsServerLogLevel
,
TypeScriptServiceConfiguration
}
from
'
../utils/configuration
'
;
import
*
as
electron
from
'
../utils/electron
'
;
import
LogDirectoryProvider
from
'
../utils/logDirectoryProvider
'
;
import
{
ILogDirectoryProvider
}
from
'
../utils/logDirectoryProvider
'
;
import
Logger
from
'
../utils/logger
'
;
import
{
TypeScriptPluginPathsProvider
}
from
'
../utils/pluginPathsProvider
'
;
import
{
PluginManager
}
from
'
../utils/plugins
'
;
...
...
@@ -43,7 +43,7 @@ const enum CompositeServerType {
export
class
TypeScriptServerSpawner
{
public
constructor
(
private
readonly
_versionProvider
:
TypeScriptVersionProvider
,
private
readonly
_logDirectoryProvider
:
LogDirectoryProvider
,
private
readonly
_logDirectoryProvider
:
I
LogDirectoryProvider
,
private
readonly
_pluginPathsProvider
:
TypeScriptPluginPathsProvider
,
private
readonly
_logger
:
Logger
,
private
readonly
_telemetryReporter
:
TelemetryReporter
,
...
...
extensions/typescript-language-features/src/typeScriptServiceClientHost.ts
浏览文件 @
3b9db3df
...
...
@@ -9,6 +9,7 @@
* ------------------------------------------------------------------------------------------ */
import
*
as
vscode
from
'
vscode
'
;
import
{
ILogDirectoryProvider
}
from
'
./utils/logDirectoryProvider
'
;
import
{
DiagnosticKind
}
from
'
./features/diagnostics
'
;
import
FileConfigurationManager
from
'
./features/fileConfigurationManager
'
;
import
LanguageProvider
from
'
./languageProvider
'
;
...
...
@@ -20,7 +21,6 @@ import { CommandManager } from './utils/commandManager';
import
{
Disposable
}
from
'
./utils/dispose
'
;
import
*
as
errorCodes
from
'
./utils/errorCodes
'
;
import
{
DiagnosticLanguage
,
LanguageDescription
}
from
'
./utils/languageDescription
'
;
import
LogDirectoryProvider
from
'
./utils/logDirectoryProvider
'
;
import
{
PluginManager
}
from
'
./utils/plugins
'
;
import
*
as
typeConverters
from
'
./utils/typeConverters
'
;
import
TypingsStatus
,
{
AtaProgressReporter
}
from
'
./utils/typingsStatus
'
;
...
...
@@ -60,7 +60,7 @@ export default class TypeScriptServiceClientHost extends Disposable {
workspaceState
:
vscode
.
Memento
,
pluginManager
:
PluginManager
,
private
readonly
commandManager
:
CommandManager
,
logDirectoryProvider
:
LogDirectoryProvider
,
logDirectoryProvider
:
I
LogDirectoryProvider
,
onCompletionAccepted
:
(
item
:
vscode
.
CompletionItem
)
=>
void
,
)
{
super
();
...
...
extensions/typescript-language-features/src/typescriptServiceClient.ts
浏览文件 @
3b9db3df
...
...
@@ -20,7 +20,7 @@ import API from './utils/api';
import
{
TsServerLogLevel
,
TypeScriptServiceConfiguration
}
from
'
./utils/configuration
'
;
import
{
Disposable
}
from
'
./utils/dispose
'
;
import
*
as
fileSchemes
from
'
./utils/fileSchemes
'
;
import
LogDirectoryProvider
from
'
./utils/logDirectoryProvider
'
;
import
{
ILogDirectoryProvider
}
from
'
./utils/logDirectoryProvider
'
;
import
Logger
from
'
./utils/logger
'
;
import
{
TypeScriptPluginPathsProvider
}
from
'
./utils/pluginPathsProvider
'
;
import
{
PluginManager
}
from
'
./utils/plugins
'
;
...
...
@@ -124,7 +124,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
constructor
(
private
readonly
workspaceState
:
vscode
.
Memento
,
public
readonly
pluginManager
:
PluginManager
,
private
readonly
logDirectoryProvider
:
LogDirectoryProvider
,
private
readonly
logDirectoryProvider
:
I
LogDirectoryProvider
,
allModeIds
:
readonly
string
[]
)
{
super
();
...
...
extensions/typescript-language-features/src/utils/logDirectoryProvider.electron.ts
0 → 100644
浏览文件 @
3b9db3df
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import
*
as
fs
from
'
fs
'
;
import
*
as
path
from
'
path
'
;
import
*
as
vscode
from
'
vscode
'
;
import
{
ILogDirectoryProvider
}
from
'
./logDirectoryProvider
'
;
import
{
memoize
}
from
'
./memoize
'
;
export
class
NodeLogDirectoryProvider
implements
ILogDirectoryProvider
{
public
constructor
(
private
readonly
context
:
vscode
.
ExtensionContext
)
{
}
public
getNewLogDirectory
():
string
|
undefined
{
const
root
=
this
.
logDirectory
();
if
(
root
)
{
try
{
return
fs
.
mkdtempSync
(
path
.
join
(
root
,
`tsserver-log-`
));
}
catch
(
e
)
{
return
undefined
;
}
}
return
undefined
;
}
@
memoize
private
logDirectory
():
string
|
undefined
{
try
{
const
path
=
this
.
context
.
logPath
;
if
(
!
fs
.
existsSync
(
path
))
{
fs
.
mkdirSync
(
path
);
}
return
this
.
context
.
logPath
;
}
catch
{
return
undefined
;
}
}
}
extensions/typescript-language-features/src/utils/logDirectoryProvider.ts
浏览文件 @
3b9db3df
...
...
@@ -3,38 +3,12 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import
*
as
fs
from
'
fs
'
;
import
*
as
path
from
'
path
'
;
import
*
as
vscode
from
'
vscode
'
;
import
{
memoize
}
from
'
./memoize
'
;
export
default
class
LogDirectoryProvider
{
public
constructor
(
private
readonly
context
:
vscode
.
ExtensionContext
)
{
}
export
interface
ILogDirectoryProvider
{
getNewLogDirectory
():
string
|
undefined
;
}
public
getNewLogDirectory
():
string
|
undefined
{
const
root
=
this
.
logDirectory
();
if
(
root
)
{
try
{
return
fs
.
mkdtempSync
(
path
.
join
(
root
,
`tsserver-log-`
));
}
catch
(
e
)
{
return
undefined
;
}
}
export
const
noopLogDirectoryProvider
=
new
class
implements
ILogDirectoryProvider
{
public
getNewLogDirectory
():
undefined
{
return
undefined
;
}
@
memoize
private
logDirectory
():
string
|
undefined
{
try
{
const
path
=
this
.
context
.
logPath
;
if
(
!
fs
.
existsSync
(
path
))
{
fs
.
mkdirSync
(
path
);
}
return
this
.
context
.
logPath
;
}
catch
{
return
undefined
;
}
}
}
};
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录