Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
7b6004f6
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,发现更多精彩内容 >>
提交
7b6004f6
编写于
3月 15, 2019
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debt - move jsonediting/configediting to common
上级
0be2e1cc
变更
10
显示空白变更内容
内联
并排
Showing
10 changed file
with
12 addition
and
30 deletion
+12
-30
src/tsconfig.strictNullChecks.json
src/tsconfig.strictNullChecks.json
+2
-2
src/vs/workbench/browser/nodeless.simpleservices.ts
src/vs/workbench/browser/nodeless.simpleservices.ts
+0
-16
src/vs/workbench/services/configuration/common/configurationEditingService.ts
...vices/configuration/common/configurationEditingService.ts
+1
-2
src/vs/workbench/services/configuration/common/jsonEditingService.ts
...bench/services/configuration/common/jsonEditingService.ts
+1
-2
src/vs/workbench/services/configuration/node/configuration.ts
...vs/workbench/services/configuration/node/configuration.ts
+1
-1
src/vs/workbench/services/configuration/node/configurationService.ts
...bench/services/configuration/node/configurationService.ts
+2
-2
src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts
...test/electron-browser/configurationEditingService.test.ts
+1
-1
src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts
...ration/test/electron-browser/configurationService.test.ts
+2
-2
src/vs/workbench/workbench.main.ts
src/vs/workbench/workbench.main.ts
+1
-1
src/vs/workbench/workbench.nodeless.main.ts
src/vs/workbench/workbench.nodeless.main.ts
+1
-1
未找到文件。
src/tsconfig.strictNullChecks.json
浏览文件 @
7b6004f6
...
...
@@ -285,10 +285,10 @@
"./vs/workbench/services/backup/node/backupFileService.ts"
,
"./vs/workbench/services/backup/test/electron-browser/backupFileService.test.ts"
,
"./vs/workbench/services/broadcast/electron-browser/broadcastService.ts"
,
"./vs/workbench/services/configuration/common/configurationEditingService.ts"
,
"./vs/workbench/services/configuration/common/jsonEditingService.ts"
,
"./vs/workbench/services/configuration/node/configuration.ts"
,
"./vs/workbench/services/configuration/node/configurationEditingService.ts"
,
"./vs/workbench/services/configuration/node/configurationService.ts"
,
"./vs/workbench/services/configuration/node/jsonEditingService.ts"
,
"./vs/workbench/services/configuration/test/common/configurationModels.test.ts"
,
"./vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts"
,
"./vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts"
,
...
...
src/vs/workbench/browser/nodeless.simpleservices.ts
浏览文件 @
7b6004f6
...
...
@@ -24,7 +24,6 @@ import { IPager } from 'vs/base/common/paging';
import
{
IExtensionManifest
,
ExtensionType
,
ExtensionIdentifier
}
from
'
vs/platform/extensions/common/extensions
'
;
import
{
NullExtensionService
,
IExtensionService
}
from
'
vs/workbench/services/extensions/common/extensions
'
;
import
{
IURLHandler
,
IURLService
}
from
'
vs/platform/url/common/url
'
;
import
{
IJSONEditingService
,
IJSONValue
}
from
'
vs/workbench/services/configuration/common/jsonEditing
'
;
import
{
IContextKeyService
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
ICommandService
}
from
'
vs/platform/commands/common/commands
'
;
import
{
ITelemetryService
,
ITelemetryData
,
ITelemetryInfo
}
from
'
vs/platform/telemetry/common/telemetry
'
;
...
...
@@ -442,21 +441,6 @@ registerSingleton(IExtensionUrlHandler, SimpleExtensionURLHandler, true);
//#endregion
//#region JSON Editing
export
class
SimpleJSONEditingService
implements
IJSONEditingService
{
_serviceBrand
:
any
;
write
(
resource
:
URI
,
value
:
IJSONValue
,
save
:
boolean
):
Promise
<
void
>
{
return
Promise
.
resolve
();
}
}
registerSingleton
(
IJSONEditingService
,
SimpleJSONEditingService
,
true
);
//#endregion
//#region Keybinding
export
class
SimpleKeybindingService
extends
StandaloneKeybindingService
{
...
...
src/vs/workbench/services/configuration/
node
/configurationEditingService.ts
→
src/vs/workbench/services/configuration/
common
/configurationEditingService.ts
浏览文件 @
7b6004f6
...
...
@@ -6,7 +6,6 @@
import
*
as
nls
from
'
vs/nls
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
*
as
json
from
'
vs/base/common/json
'
;
import
*
as
encoding
from
'
vs/base/node/encoding
'
;
import
*
as
strings
from
'
vs/base/common/strings
'
;
import
{
setProperty
}
from
'
vs/base/common/jsonEdit
'
;
import
{
Queue
}
from
'
vs/base/common/async
'
;
...
...
@@ -367,7 +366,7 @@ export class ConfigurationEditingService {
private
async
resolveModelReference
(
resource
:
URI
):
Promise
<
IReference
<
IResolvedTextEditorModel
>>
{
const
exists
=
await
this
.
fileService
.
existsFile
(
resource
);
if
(
!
exists
)
{
await
this
.
fileService
.
updateContent
(
resource
,
'
{}
'
,
{
encoding
:
encoding
.
UTF8
});
await
this
.
fileService
.
updateContent
(
resource
,
'
{}
'
,
{
encoding
:
'
utf8
'
});
}
return
this
.
textModelResolverService
.
createModelReference
(
resource
);
}
...
...
src/vs/workbench/services/configuration/
node
/jsonEditingService.ts
→
src/vs/workbench/services/configuration/
common
/jsonEditingService.ts
浏览文件 @
7b6004f6
...
...
@@ -6,7 +6,6 @@
import
*
as
nls
from
'
vs/nls
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
*
as
json
from
'
vs/base/common/json
'
;
import
*
as
encoding
from
'
vs/base/node/encoding
'
;
import
*
as
strings
from
'
vs/base/common/strings
'
;
import
{
setProperty
}
from
'
vs/base/common/jsonEdit
'
;
import
{
Queue
}
from
'
vs/base/common/async
'
;
...
...
@@ -87,7 +86,7 @@ export class JSONEditingService implements IJSONEditingService {
private
async
resolveModelReference
(
resource
:
URI
):
Promise
<
IReference
<
IResolvedTextEditorModel
>>
{
const
exists
=
await
this
.
fileService
.
existsFile
(
resource
);
if
(
!
exists
)
{
await
this
.
fileService
.
updateContent
(
resource
,
'
{}
'
,
{
encoding
:
encoding
.
UTF8
});
await
this
.
fileService
.
updateContent
(
resource
,
'
{}
'
,
{
encoding
:
'
utf8
'
});
}
return
this
.
textModelResolverService
.
createModelReference
(
resource
);
}
...
...
src/vs/workbench/services/configuration/node/configuration.ts
浏览文件 @
7b6004f6
...
...
@@ -18,7 +18,7 @@ import { WorkspaceConfigurationModelParser, FolderSettingsModelParser, Standalon
import
{
FOLDER_SETTINGS_PATH
,
TASKS_CONFIGURATION_KEY
,
FOLDER_SETTINGS_NAME
,
LAUNCH_CONFIGURATION_KEY
}
from
'
vs/workbench/services/configuration/common/configuration
'
;
import
{
IStoredWorkspaceFolder
}
from
'
vs/platform/workspaces/common/workspaces
'
;
import
*
as
extfs
from
'
vs/base/node/extfs
'
;
import
{
JSONEditingService
}
from
'
vs/workbench/services/configuration/
node
/jsonEditingService
'
;
import
{
JSONEditingService
}
from
'
vs/workbench/services/configuration/
common
/jsonEditingService
'
;
import
{
WorkbenchState
,
IWorkspaceFolder
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
ConfigurationScope
}
from
'
vs/platform/configuration/common/configurationRegistry
'
;
import
{
extname
,
join
}
from
'
vs/base/common/path
'
;
...
...
src/vs/workbench/services/configuration/node/configurationService.ts
浏览文件 @
7b6004f6
...
...
@@ -27,9 +27,9 @@ import { IExtensionService } from 'vs/workbench/services/extensions/common/exten
import
{
ICommandService
}
from
'
vs/platform/commands/common/commands
'
;
import
product
from
'
vs/platform/product/node/product
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
ConfigurationEditingService
}
from
'
vs/workbench/services/configuration/
node
/configurationEditingService
'
;
import
{
ConfigurationEditingService
}
from
'
vs/workbench/services/configuration/
common
/configurationEditingService
'
;
import
{
WorkspaceConfiguration
,
FolderConfiguration
}
from
'
vs/workbench/services/configuration/node/configuration
'
;
import
{
JSONEditingService
}
from
'
vs/workbench/services/configuration/
node
/jsonEditingService
'
;
import
{
JSONEditingService
}
from
'
vs/workbench/services/configuration/
common
/jsonEditingService
'
;
import
{
UserConfiguration
}
from
'
vs/platform/configuration/node/configuration
'
;
import
{
IJSONSchema
,
IJSONSchemaMap
}
from
'
vs/base/common/jsonSchema
'
;
import
{
localize
}
from
'
vs/nls
'
;
...
...
src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts
浏览文件 @
7b6004f6
...
...
@@ -21,7 +21,7 @@ import * as uuid from 'vs/base/common/uuid';
import
{
IConfigurationRegistry
,
Extensions
as
ConfigurationExtensions
}
from
'
vs/platform/configuration/common/configurationRegistry
'
;
import
{
WorkspaceService
}
from
'
vs/workbench/services/configuration/node/configurationService
'
;
import
{
FileService
}
from
'
vs/workbench/services/files/node/fileService
'
;
import
{
ConfigurationEditingService
,
ConfigurationEditingError
,
ConfigurationEditingErrorCode
}
from
'
vs/workbench/services/configuration/
node
/configurationEditingService
'
;
import
{
ConfigurationEditingService
,
ConfigurationEditingError
,
ConfigurationEditingErrorCode
}
from
'
vs/workbench/services/configuration/
common
/configurationEditingService
'
;
import
{
IFileService
}
from
'
vs/platform/files/common/files
'
;
import
{
WORKSPACE_STANDALONE_CONFIGURATIONS
}
from
'
vs/workbench/services/configuration/common/configuration
'
;
import
{
IConfigurationService
,
ConfigurationTarget
}
from
'
vs/platform/configuration/common/configuration
'
;
...
...
src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts
浏览文件 @
7b6004f6
...
...
@@ -18,7 +18,7 @@ import * as uuid from 'vs/base/common/uuid';
import
{
IConfigurationRegistry
,
Extensions
as
ConfigurationExtensions
,
ConfigurationScope
}
from
'
vs/platform/configuration/common/configurationRegistry
'
;
import
{
WorkspaceService
}
from
'
vs/workbench/services/configuration/node/configurationService
'
;
import
{
ISingleFolderWorkspaceInitializationPayload
}
from
'
vs/platform/workspaces/common/workspaces
'
;
import
{
ConfigurationEditingErrorCode
}
from
'
vs/workbench/services/configuration/
node
/configurationEditingService
'
;
import
{
ConfigurationEditingErrorCode
}
from
'
vs/workbench/services/configuration/
common
/configurationEditingService
'
;
import
{
IFileService
,
FileChangesEvent
,
FileChangeType
}
from
'
vs/platform/files/common/files
'
;
import
{
IWorkspaceContextService
,
WorkbenchState
,
IWorkspaceFoldersChangeEvent
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
ConfigurationTarget
,
IConfigurationService
,
IConfigurationChangeEvent
}
from
'
vs/platform/configuration/common/configuration
'
;
...
...
@@ -30,7 +30,7 @@ import { ITextFileService } from 'vs/workbench/services/textfile/common/textfile
import
{
ITextModelService
}
from
'
vs/editor/common/services/resolverService
'
;
import
{
TextModelResolverService
}
from
'
vs/workbench/services/textmodelResolver/common/textModelResolverService
'
;
import
{
IJSONEditingService
}
from
'
vs/workbench/services/configuration/common/jsonEditing
'
;
import
{
JSONEditingService
}
from
'
vs/workbench/services/configuration/
node
/jsonEditingService
'
;
import
{
JSONEditingService
}
from
'
vs/workbench/services/configuration/
common
/jsonEditingService
'
;
import
{
createHash
}
from
'
crypto
'
;
import
{
Emitter
,
Event
}
from
'
vs/base/common/event
'
;
import
{
Schemas
}
from
'
vs/base/common/network
'
;
...
...
src/vs/workbench/workbench.main.ts
浏览文件 @
7b6004f6
...
...
@@ -108,7 +108,7 @@ import 'vs/workbench/services/editor/browser/codeEditorService';
import
'
vs/workbench/services/broadcast/electron-browser/broadcastService
'
;
import
'
vs/workbench/services/preferences/browser/preferencesService
'
;
import
'
vs/workbench/services/output/node/outputChannelModelService
'
;
import
'
vs/workbench/services/configuration/
node
/jsonEditingService
'
;
import
'
vs/workbench/services/configuration/
common
/jsonEditingService
'
;
import
'
vs/workbench/services/textmodelResolver/common/textModelResolverService
'
;
import
'
vs/workbench/services/textfile/common/textFileService
'
;
import
'
vs/workbench/services/dialogs/browser/fileDialogService
'
;
...
...
src/vs/workbench/workbench.nodeless.main.ts
浏览文件 @
7b6004f6
...
...
@@ -111,7 +111,7 @@ import 'vs/workbench/services/editor/browser/codeEditorService';
// import 'vs/workbench/services/broadcast/electron-browser/broadcastService';
import
'
vs/workbench/services/preferences/browser/preferencesService
'
;
import
'
vs/workbench/services/output/common/outputChannelModelService
'
;
// import 'vs/workbench/services/configuration/node
/jsonEditingService';
import
'
vs/workbench/services/configuration/common
/jsonEditingService
'
;
import
'
vs/workbench/services/textmodelResolver/common/textModelResolverService
'
;
import
'
vs/workbench/services/textfile/common/textFileService
'
;
import
'
vs/workbench/services/dialogs/browser/fileDialogService
'
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录