Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
c2d3b574
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,发现更多精彩内容 >>
提交
c2d3b574
编写于
11月 07, 2019
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix compile error
上级
74b0d979
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
7 addition
and
5 deletion
+7
-5
src/vs/editor/common/config/editorOptions.ts
src/vs/editor/common/config/editorOptions.ts
+2
-1
src/vs/workbench/contrib/files/browser/files.contribution.ts
src/vs/workbench/contrib/files/browser/files.contribution.ts
+2
-2
src/vs/workbench/contrib/remote/electron-browser/remote.contribution.ts
...ch/contrib/remote/electron-browser/remote.contribution.ts
+2
-1
src/vs/workbench/services/preferences/common/preferencesModels.ts
...orkbench/services/preferences/common/preferencesModels.ts
+1
-1
未找到文件。
src/vs/editor/common/config/editorOptions.ts
浏览文件 @
c2d3b574
...
@@ -12,6 +12,7 @@ import { USUAL_WORD_SEPARATORS } from 'vs/editor/common/model/wordHelper';
...
@@ -12,6 +12,7 @@ import { USUAL_WORD_SEPARATORS } from 'vs/editor/common/model/wordHelper';
import
{
AccessibilitySupport
}
from
'
vs/platform/accessibility/common/accessibility
'
;
import
{
AccessibilitySupport
}
from
'
vs/platform/accessibility/common/accessibility
'
;
import
{
IConfigurationPropertySchema
}
from
'
vs/platform/configuration/common/configurationRegistry
'
;
import
{
IConfigurationPropertySchema
}
from
'
vs/platform/configuration/common/configurationRegistry
'
;
import
{
IDimension
}
from
'
vs/editor/common/editorCommon
'
;
import
{
IDimension
}
from
'
vs/editor/common/editorCommon
'
;
import
{
IJSONSchema
}
from
'
vs/base/common/jsonSchema
'
;
//#region typed options
//#region typed options
...
@@ -1323,7 +1324,7 @@ class EditorGoToLocation extends BaseEditorOption<EditorOption.gotoLocation, GoT
...
@@ -1323,7 +1324,7 @@ class EditorGoToLocation extends BaseEditorOption<EditorOption.gotoLocation, GoT
multipleImplemenations
:
'
peek
'
,
multipleImplemenations
:
'
peek
'
,
multipleReferences
:
'
peek
'
,
multipleReferences
:
'
peek
'
,
};
};
const
jsonSubset
=
{
const
jsonSubset
:
IJSONSchema
=
{
type
:
'
string
'
,
type
:
'
string
'
,
enum
:
[
'
peek
'
,
'
gotoAndPeek
'
,
'
goto
'
],
enum
:
[
'
peek
'
,
'
gotoAndPeek
'
,
'
goto
'
],
default
:
defaults
.
multiple
,
default
:
defaults
.
multiple
,
...
...
src/vs/workbench/contrib/files/browser/files.contribution.ts
浏览文件 @
c2d3b574
...
@@ -9,7 +9,7 @@ import * as nls from 'vs/nls';
...
@@ -9,7 +9,7 @@ import * as nls from 'vs/nls';
import
{
sep
}
from
'
vs/base/common/path
'
;
import
{
sep
}
from
'
vs/base/common/path
'
;
import
{
SyncActionDescriptor
,
MenuId
,
MenuRegistry
}
from
'
vs/platform/actions/common/actions
'
;
import
{
SyncActionDescriptor
,
MenuId
,
MenuRegistry
}
from
'
vs/platform/actions/common/actions
'
;
import
{
Registry
}
from
'
vs/platform/registry/common/platform
'
;
import
{
Registry
}
from
'
vs/platform/registry/common/platform
'
;
import
{
IConfigurationRegistry
,
Extensions
as
ConfigurationExtensions
,
ConfigurationScope
}
from
'
vs/platform/configuration/common/configurationRegistry
'
;
import
{
IConfigurationRegistry
,
Extensions
as
ConfigurationExtensions
,
ConfigurationScope
,
IConfigurationPropertySchema
}
from
'
vs/platform/configuration/common/configurationRegistry
'
;
import
{
IWorkbenchActionRegistry
,
Extensions
as
ActionExtensions
}
from
'
vs/workbench/common/actions
'
;
import
{
IWorkbenchActionRegistry
,
Extensions
as
ActionExtensions
}
from
'
vs/workbench/common/actions
'
;
import
{
IWorkbenchContributionsRegistry
,
Extensions
as
WorkbenchExtensions
,
IWorkbenchContribution
}
from
'
vs/workbench/common/contributions
'
;
import
{
IWorkbenchContributionsRegistry
,
Extensions
as
WorkbenchExtensions
,
IWorkbenchContribution
}
from
'
vs/workbench/common/contributions
'
;
import
{
IEditorInputFactory
,
EditorInput
,
IFileEditorInput
,
IEditorInputFactoryRegistry
,
Extensions
as
EditorInputExtensions
}
from
'
vs/workbench/common/editor
'
;
import
{
IEditorInputFactory
,
EditorInput
,
IFileEditorInput
,
IEditorInputFactoryRegistry
,
Extensions
as
EditorInputExtensions
}
from
'
vs/workbench/common/editor
'
;
...
@@ -176,7 +176,7 @@ Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).regi
...
@@ -176,7 +176,7 @@ Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).regi
// Configuration
// Configuration
const
configurationRegistry
=
Registry
.
as
<
IConfigurationRegistry
>
(
ConfigurationExtensions
.
Configuration
);
const
configurationRegistry
=
Registry
.
as
<
IConfigurationRegistry
>
(
ConfigurationExtensions
.
Configuration
);
const
hotExitConfiguration
=
platform
.
isNative
?
const
hotExitConfiguration
:
IConfigurationPropertySchema
=
platform
.
isNative
?
{
{
'
type
'
:
'
string
'
,
'
type
'
:
'
string
'
,
'
scope
'
:
ConfigurationScope
.
APPLICATION
,
'
scope
'
:
ConfigurationScope
.
APPLICATION
,
...
...
src/vs/workbench/contrib/remote/electron-browser/remote.contribution.ts
浏览文件 @
c2d3b574
...
@@ -38,6 +38,7 @@ import { IHostService } from 'vs/workbench/services/host/browser/host';
...
@@ -38,6 +38,7 @@ import { IHostService } from 'vs/workbench/services/host/browser/host';
import
{
RemoteConnectionState
,
Deprecated_RemoteAuthorityContext
,
RemoteFileDialogContext
}
from
'
vs/workbench/browser/contextkeys
'
;
import
{
RemoteConnectionState
,
Deprecated_RemoteAuthorityContext
,
RemoteFileDialogContext
}
from
'
vs/workbench/browser/contextkeys
'
;
import
{
IDownloadService
}
from
'
vs/platform/download/common/download
'
;
import
{
IDownloadService
}
from
'
vs/platform/download/common/download
'
;
import
{
OpenLocalFileFolderCommand
,
OpenLocalFileCommand
,
OpenLocalFolderCommand
,
SaveLocalFileCommand
}
from
'
vs/workbench/services/dialogs/browser/simpleFileDialog
'
;
import
{
OpenLocalFileFolderCommand
,
OpenLocalFileCommand
,
OpenLocalFolderCommand
,
SaveLocalFileCommand
}
from
'
vs/workbench/services/dialogs/browser/simpleFileDialog
'
;
import
{
IJSONSchema
}
from
'
vs/base/common/jsonSchema
'
;
const
WINDOW_ACTIONS_COMMAND_ID
=
'
workbench.action.remote.showMenu
'
;
const
WINDOW_ACTIONS_COMMAND_ID
=
'
workbench.action.remote.showMenu
'
;
const
CLOSE_REMOTE_COMMAND_ID
=
'
workbench.action.remote.close
'
;
const
CLOSE_REMOTE_COMMAND_ID
=
'
workbench.action.remote.close
'
;
...
@@ -365,7 +366,7 @@ workbenchContributionsRegistry.registerWorkbenchContribution(RemoteWindowActiveI
...
@@ -365,7 +366,7 @@ workbenchContributionsRegistry.registerWorkbenchContribution(RemoteWindowActiveI
workbenchContributionsRegistry
.
registerWorkbenchContribution
(
RemoteTelemetryEnablementUpdater
,
LifecyclePhase
.
Ready
);
workbenchContributionsRegistry
.
registerWorkbenchContribution
(
RemoteTelemetryEnablementUpdater
,
LifecyclePhase
.
Ready
);
workbenchContributionsRegistry
.
registerWorkbenchContribution
(
RemoteEmptyWorkbenchPresentation
,
LifecyclePhase
.
Starting
);
workbenchContributionsRegistry
.
registerWorkbenchContribution
(
RemoteEmptyWorkbenchPresentation
,
LifecyclePhase
.
Starting
);
const
extensionKindSchema
=
{
const
extensionKindSchema
:
IJSONSchema
=
{
type
:
'
string
'
,
type
:
'
string
'
,
enum
:
[
enum
:
[
'
ui
'
,
'
ui
'
,
...
...
src/vs/workbench/services/preferences/common/preferencesModels.ts
浏览文件 @
c2d3b574
...
@@ -1117,7 +1117,7 @@ export function createValidator(prop: IConfigurationPropertySchema): (value: any
...
@@ -1117,7 +1117,7 @@ export function createValidator(prop: IConfigurationPropertySchema): (value: any
patternRegex
=
new
RegExp
(
prop
.
pattern
);
patternRegex
=
new
RegExp
(
prop
.
pattern
);
}
}
const
type
=
Array
.
isArray
(
prop
.
type
)
?
prop
.
type
:
[
prop
.
type
];
const
type
:
(
string
|
undefined
)[]
=
Array
.
isArray
(
prop
.
type
)
?
prop
.
type
:
[
prop
.
type
];
const
canBeType
=
(
t
:
string
)
=>
type
.
indexOf
(
t
)
>
-
1
;
const
canBeType
=
(
t
:
string
)
=>
type
.
indexOf
(
t
)
>
-
1
;
const
isNullable
=
canBeType
(
'
null
'
);
const
isNullable
=
canBeType
(
'
null
'
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录