Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
14206913
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,发现更多精彩内容 >>
提交
14206913
编写于
5月 13, 2019
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debt - merge contextkeys into one
上级
744fefaa
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
26 addition
and
33 deletion
+26
-33
src/vs/workbench/browser/actions/layoutActions.ts
src/vs/workbench/browser/actions/layoutActions.ts
+1
-1
src/vs/workbench/browser/contextkeys.ts
src/vs/workbench/browser/contextkeys.ts
+20
-2
src/vs/workbench/common/contextkeys.ts
src/vs/workbench/common/contextkeys.ts
+0
-25
src/vs/workbench/contrib/extensions/electron-browser/extensionsViewlet.ts
.../contrib/extensions/electron-browser/extensionsViewlet.ts
+1
-1
src/vs/workbench/contrib/files/browser/fileActions.contribution.ts
...rkbench/contrib/files/browser/fileActions.contribution.ts
+1
-1
src/vs/workbench/contrib/preferences/electron-browser/preferences.contribution.ts
.../preferences/electron-browser/preferences.contribution.ts
+1
-1
src/vs/workbench/electron-browser/main.contribution.ts
src/vs/workbench/electron-browser/main.contribution.ts
+1
-1
src/vs/workbench/services/dialogs/browser/remoteFileDialog.ts
...vs/workbench/services/dialogs/browser/remoteFileDialog.ts
+1
-1
未找到文件。
src/vs/workbench/browser/actions/layoutActions.ts
浏览文件 @
14206913
...
...
@@ -19,7 +19,7 @@ import { KeyMod, KeyCode, KeyChord } from 'vs/base/common/keyCodes';
import
{
dispose
,
IDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
MenuBarVisibility
}
from
'
vs/platform/windows/common/windows
'
;
import
{
isWindows
,
isLinux
}
from
'
vs/base/common/platform
'
;
import
{
IsMacContext
}
from
'
vs/workbench/
common
/contextkeys
'
;
import
{
IsMacContext
}
from
'
vs/workbench/
browser
/contextkeys
'
;
import
{
KeybindingsRegistry
,
KeybindingWeight
}
from
'
vs/platform/keybinding/common/keybindingsRegistry
'
;
import
{
InEditorZenModeContext
}
from
'
vs/workbench/common/editor
'
;
import
{
ContextKeyExpr
}
from
'
vs/platform/contextkey/common/contextkey
'
;
...
...
src/vs/workbench/browser/contextkeys.ts
浏览文件 @
14206913
...
...
@@ -5,11 +5,10 @@
import
{
Event
}
from
'
vs/base/common/event
'
;
import
{
Disposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
IContextKeyService
,
IContextKey
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
IContextKeyService
,
IContextKey
,
RawContextKey
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
InputFocusedContext
}
from
'
vs/platform/contextkey/common/contextkeys
'
;
import
{
IWindowsConfiguration
}
from
'
vs/platform/windows/common/windows
'
;
import
{
ActiveEditorContext
,
EditorsVisibleContext
,
TextCompareEditorVisibleContext
,
TextCompareEditorActiveContext
,
ActiveEditorGroupEmptyContext
,
MultipleEditorGroupsContext
,
TEXT_DIFF_EDITOR_ID
,
SplitEditorsVertically
,
InEditorZenModeContext
}
from
'
vs/workbench/common/editor
'
;
import
{
IsMacContext
,
IsLinuxContext
,
IsWindowsContext
,
HasMacNativeTabsContext
,
IsDevelopmentContext
,
SupportsWorkspacesContext
,
WorkbenchStateContext
,
WorkspaceFolderCountContext
,
RemoteAuthorityContext
}
from
'
vs/workbench/common/contextkeys
'
;
import
{
trackFocus
,
addDisposableListener
,
EventType
}
from
'
vs/base/browser/dom
'
;
import
{
preferredSideBySideGroupDirection
,
GroupDirection
,
IEditorGroupsService
}
from
'
vs/workbench/services/editor/common/editorGroupsService
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
...
...
@@ -19,6 +18,25 @@ import { WorkbenchState, IWorkspaceContextService } from 'vs/platform/workspace/
import
{
SideBarVisibleContext
}
from
'
vs/workbench/common/viewlet
'
;
import
{
IWorkbenchLayoutService
,
Parts
}
from
'
vs/workbench/services/layout/browser/layoutService
'
;
import
{
IViewletService
}
from
'
vs/workbench/services/viewlet/browser/viewlet
'
;
import
{
isMacintosh
,
isLinux
,
isWindows
}
from
'
vs/base/common/platform
'
;
export
const
IsMacContext
=
new
RawContextKey
<
boolean
>
(
'
isMac
'
,
isMacintosh
);
export
const
IsLinuxContext
=
new
RawContextKey
<
boolean
>
(
'
isLinux
'
,
isLinux
);
export
const
IsWindowsContext
=
new
RawContextKey
<
boolean
>
(
'
isWindows
'
,
isWindows
);
export
const
RemoteAuthorityContext
=
new
RawContextKey
<
string
>
(
'
remoteAuthority
'
,
''
);
export
const
HasMacNativeTabsContext
=
new
RawContextKey
<
boolean
>
(
'
hasMacNativeTabs
'
,
false
);
export
const
SupportsWorkspacesContext
=
new
RawContextKey
<
boolean
>
(
'
supportsWorkspaces
'
,
true
);
export
const
IsDevelopmentContext
=
new
RawContextKey
<
boolean
>
(
'
isDevelopment
'
,
false
);
export
const
WorkbenchStateContext
=
new
RawContextKey
<
string
>
(
'
workbenchState
'
,
undefined
);
export
const
WorkspaceFolderCountContext
=
new
RawContextKey
<
number
>
(
'
workspaceFolderCount
'
,
0
);
export
const
RemoteFileDialogContext
=
new
RawContextKey
<
boolean
>
(
'
remoteFileDialogVisible
'
,
false
);
export
class
WorkbenchContextKeysHandler
extends
Disposable
{
private
inputFocusedContext
:
IContextKey
<
boolean
>
;
...
...
src/vs/workbench/common/contextkeys.ts
已删除
100644 → 0
浏览文件 @
744fefaa
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import
{
RawContextKey
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
isMacintosh
,
isLinux
,
isWindows
}
from
'
vs/base/common/platform
'
;
export
const
IsMacContext
=
new
RawContextKey
<
boolean
>
(
'
isMac
'
,
isMacintosh
);
export
const
IsLinuxContext
=
new
RawContextKey
<
boolean
>
(
'
isLinux
'
,
isLinux
);
export
const
IsWindowsContext
=
new
RawContextKey
<
boolean
>
(
'
isWindows
'
,
isWindows
);
export
const
RemoteAuthorityContext
=
new
RawContextKey
<
string
>
(
'
remoteAuthority
'
,
''
);
export
const
HasMacNativeTabsContext
=
new
RawContextKey
<
boolean
>
(
'
hasMacNativeTabs
'
,
false
);
export
const
SupportsWorkspacesContext
=
new
RawContextKey
<
boolean
>
(
'
supportsWorkspaces
'
,
true
);
export
const
IsDevelopmentContext
=
new
RawContextKey
<
boolean
>
(
'
isDevelopment
'
,
false
);
export
const
WorkbenchStateContext
=
new
RawContextKey
<
string
>
(
'
workbenchState
'
,
undefined
);
export
const
WorkspaceFolderCountContext
=
new
RawContextKey
<
number
>
(
'
workspaceFolderCount
'
,
0
);
export
const
RemoteFileDialogContext
=
new
RawContextKey
<
boolean
>
(
'
remoteFileDialogVisible
'
,
false
);
src/vs/workbench/contrib/extensions/electron-browser/extensionsViewlet.ts
浏览文件 @
14206913
...
...
@@ -54,7 +54,7 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
import
{
ExtensionType
}
from
'
vs/platform/extensions/common/extensions
'
;
import
{
Registry
}
from
'
vs/platform/registry/common/platform
'
;
import
{
ViewContainerViewlet
}
from
'
vs/workbench/browser/parts/views/viewsViewlet
'
;
import
{
RemoteAuthorityContext
}
from
'
vs/workbench/
common
/contextkeys
'
;
import
{
RemoteAuthorityContext
}
from
'
vs/workbench/
browser
/contextkeys
'
;
import
{
IWorkbenchEnvironmentService
}
from
'
vs/workbench/services/environment/common/environmentService
'
;
import
{
REMOTE_HOST_SCHEME
}
from
'
vs/platform/remote/common/remoteHosts
'
;
import
{
ILabelService
}
from
'
vs/platform/label/common/label
'
;
...
...
src/vs/workbench/contrib/files/browser/fileActions.contribution.ts
浏览文件 @
14206913
...
...
@@ -23,7 +23,7 @@ import { ResourceContextKey } from 'vs/workbench/common/resources';
import
{
WorkbenchListDoubleSelection
}
from
'
vs/platform/list/browser/listService
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
{
Schemas
}
from
'
vs/base/common/network
'
;
import
{
SupportsWorkspacesContext
}
from
'
vs/workbench/
common
/contextkeys
'
;
import
{
SupportsWorkspacesContext
}
from
'
vs/workbench/
browser
/contextkeys
'
;
import
{
ServicesAccessor
}
from
'
vs/platform/instantiation/common/instantiation
'
;
// Contribute Global Actions
...
...
src/vs/workbench/contrib/preferences/electron-browser/preferences.contribution.ts
浏览文件 @
14206913
...
...
@@ -13,7 +13,7 @@ import * as nls from 'vs/nls';
import
{
MenuId
,
MenuRegistry
,
SyncActionDescriptor
}
from
'
vs/platform/actions/common/actions
'
;
import
{
CommandsRegistry
}
from
'
vs/platform/commands/common/commands
'
;
import
{
ContextKeyExpr
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
WorkbenchStateContext
,
RemoteAuthorityContext
}
from
'
vs/workbench/
common
/contextkeys
'
;
import
{
WorkbenchStateContext
,
RemoteAuthorityContext
}
from
'
vs/workbench/
browser
/contextkeys
'
;
import
{
IWorkbenchEnvironmentService
}
from
'
vs/workbench/services/environment/common/environmentService
'
;
import
{
SyncDescriptor
}
from
'
vs/platform/instantiation/common/descriptors
'
;
import
{
registerSingleton
}
from
'
vs/platform/instantiation/common/extensions
'
;
...
...
src/vs/workbench/electron-browser/main.contribution.ts
浏览文件 @
14206913
...
...
@@ -21,7 +21,7 @@ import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/co
import
{
CommandsRegistry
}
from
'
vs/platform/commands/common/commands
'
;
import
{
IInstantiationService
,
ServicesAccessor
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
ADD_ROOT_FOLDER_COMMAND_ID
}
from
'
vs/workbench/browser/actions/workspaceCommands
'
;
import
{
SupportsWorkspacesContext
,
IsMacContext
,
HasMacNativeTabsContext
,
IsDevelopmentContext
,
WorkbenchStateContext
,
WorkspaceFolderCountContext
,
RemoteFileDialogContext
}
from
'
vs/workbench/
common
/contextkeys
'
;
import
{
SupportsWorkspacesContext
,
IsMacContext
,
HasMacNativeTabsContext
,
IsDevelopmentContext
,
WorkbenchStateContext
,
WorkspaceFolderCountContext
,
RemoteFileDialogContext
}
from
'
vs/workbench/
browser
/contextkeys
'
;
import
{
NoEditorsVisibleContext
,
SingleEditorGroupsContext
}
from
'
vs/workbench/common/editor
'
;
import
{
IWindowService
,
IWindowsService
}
from
'
vs/platform/windows/common/windows
'
;
import
{
LogStorageAction
}
from
'
vs/platform/storage/node/storageService
'
;
...
...
src/vs/workbench/services/dialogs/browser/remoteFileDialog.ts
浏览文件 @
14206913
...
...
@@ -22,7 +22,7 @@ import { Schemas } from 'vs/base/common/network';
import
{
IWorkbenchEnvironmentService
}
from
'
vs/workbench/services/environment/common/environmentService
'
;
import
{
IRemoteAgentService
}
from
'
vs/workbench/services/remote/common/remoteAgentService
'
;
import
{
IContextKeyService
,
IContextKey
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
RemoteFileDialogContext
}
from
'
vs/workbench/
common
/contextkeys
'
;
import
{
RemoteFileDialogContext
}
from
'
vs/workbench/
browser
/contextkeys
'
;
import
{
equalsIgnoreCase
,
format
}
from
'
vs/base/common/strings
'
;
import
{
OpenLocalFileAction
,
OpenLocalFileFolderAction
,
OpenLocalFolderAction
}
from
'
vs/workbench/browser/actions/workspaceActions
'
;
import
{
IKeybindingService
}
from
'
vs/platform/keybinding/common/keybinding
'
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录