Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
3760c273
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,发现更多精彩内容 >>
提交
3760c273
编写于
3月 04, 2019
作者:
D
Daniel Imms
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move terminalPanel, electron-browser->browser
Part of #69115
上级
5b7bdacc
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
11 addition
and
13 deletion
+11
-13
src/tsconfig.strictNullChecks.json
src/tsconfig.strictNullChecks.json
+1
-1
src/vs/workbench/contrib/terminal/browser/terminalPanel.ts
src/vs/workbench/contrib/terminal/browser/terminalPanel.ts
+6
-9
src/vs/workbench/contrib/terminal/common/terminal.ts
src/vs/workbench/contrib/terminal/common/terminal.ts
+1
-0
src/vs/workbench/contrib/terminal/electron-browser/terminal.contribution.ts
...ontrib/terminal/electron-browser/terminal.contribution.ts
+1
-1
src/vs/workbench/contrib/terminal/electron-browser/terminalService.ts
...ench/contrib/terminal/electron-browser/terminalService.ts
+1
-1
src/vs/workbench/workbench.main.ts
src/vs/workbench/workbench.main.ts
+1
-1
未找到文件。
src/tsconfig.strictNullChecks.json
浏览文件 @
3760c273
...
...
@@ -281,6 +281,7 @@
"./vs/workbench/contrib/terminal/browser/terminalActions.ts"
,
"./vs/workbench/contrib/terminal/browser/terminalFindWidget.ts"
,
"./vs/workbench/contrib/terminal/browser/terminalLinkHandler.ts"
,
"./vs/workbench/contrib/terminal/browser/terminalPanel.ts"
,
"./vs/workbench/contrib/terminal/browser/terminalQuickOpen.ts"
,
"./vs/workbench/contrib/terminal/browser/terminalTab.ts"
,
"./vs/workbench/contrib/terminal/browser/terminalWidgetManager.ts"
,
...
...
@@ -292,7 +293,6 @@
"./vs/workbench/contrib/terminal/common/terminalService.ts"
,
"./vs/workbench/contrib/terminal/electron-browser/terminalConfigHelper.ts"
,
"./vs/workbench/contrib/terminal/electron-browser/terminalInstance.ts"
,
"./vs/workbench/contrib/terminal/electron-browser/terminalPanel.ts"
,
"./vs/workbench/contrib/terminal/electron-browser/terminalProcessManager.ts"
,
"./vs/workbench/contrib/terminal/node/terminal.ts"
,
"./vs/workbench/contrib/terminal/node/terminalCommandTracker.ts"
,
...
...
src/vs/workbench/contrib/terminal/
electron-
browser/terminalPanel.ts
→
src/vs/workbench/contrib/terminal/browser/terminalPanel.ts
浏览文件 @
3760c273
...
...
@@ -24,7 +24,6 @@ import { URI } from 'vs/base/common/uri';
import
{
TERMINAL_BACKGROUND_COLOR
,
TERMINAL_BORDER_COLOR
}
from
'
vs/workbench/contrib/terminal/common/terminalColorRegistry
'
;
import
{
DataTransfers
}
from
'
vs/base/browser/dnd
'
;
import
{
INotificationService
,
IPromptChoice
,
Severity
}
from
'
vs/platform/notification/common/notification
'
;
import
{
TerminalConfigHelper
}
from
'
vs/workbench/contrib/terminal/electron-browser/terminalConfigHelper
'
;
import
{
IStorageService
}
from
'
vs/platform/storage/common/storage
'
;
const
FIND_FOCUS_CLASS
=
'
find-focused
'
;
...
...
@@ -82,14 +81,12 @@ export class TerminalPanel extends Panel {
if
(
e
.
affectsConfiguration
(
'
terminal.integrated.fontFamily
'
)
||
e
.
affectsConfiguration
(
'
editor.fontFamily
'
))
{
const
configHelper
=
this
.
_terminalService
.
configHelper
;
if
(
configHelper
instanceof
TerminalConfigHelper
)
{
if
(
!
configHelper
.
configFontIsMonospace
())
{
const
choices
:
IPromptChoice
[]
=
[{
label
:
nls
.
localize
(
'
terminal.useMonospace
'
,
"
Use 'monospace'
"
),
run
:
()
=>
this
.
_configurationService
.
updateValue
(
'
terminal.integrated.fontFamily
'
,
'
monospace
'
),
}];
this
.
_notificationService
.
prompt
(
Severity
.
Warning
,
nls
.
localize
(
'
terminal.monospaceOnly
'
,
"
The terminal only supports monospace fonts.
"
),
choices
);
}
if
(
!
configHelper
.
configFontIsMonospace
())
{
const
choices
:
IPromptChoice
[]
=
[{
label
:
nls
.
localize
(
'
terminal.useMonospace
'
,
"
Use 'monospace'
"
),
run
:
()
=>
this
.
_configurationService
.
updateValue
(
'
terminal.integrated.fontFamily
'
,
'
monospace
'
),
}];
this
.
_notificationService
.
prompt
(
Severity
.
Warning
,
nls
.
localize
(
'
terminal.monospaceOnly
'
,
"
The terminal only supports monospace fonts.
"
),
choices
);
}
}
}));
...
...
src/vs/workbench/contrib/terminal/common/terminal.ts
浏览文件 @
3760c273
...
...
@@ -107,6 +107,7 @@ export interface ITerminalConfiguration {
export
interface
ITerminalConfigHelper
{
config
:
ITerminalConfiguration
;
configFontIsMonospace
():
boolean
;
getFont
():
ITerminalFont
;
/**
* Merges the default shell path and args into the provided launch configuration
...
...
src/vs/workbench/contrib/terminal/electron-browser/terminal.contribution.ts
浏览文件 @
3760c273
...
...
@@ -28,7 +28,7 @@ import { getQuickNavigateHandler } from 'vs/workbench/browser/parts/quickopen/qu
import
{
IQuickOpenRegistry
,
Extensions
as
QuickOpenExtensions
,
QuickOpenHandlerDescriptor
}
from
'
vs/workbench/browser/quickopen
'
;
import
{
Scope
,
IActionBarRegistry
,
Extensions
as
ActionBarExtensions
}
from
'
vs/workbench/browser/actions
'
;
import
{
CommandsRegistry
}
from
'
vs/platform/commands/common/commands
'
;
import
{
TerminalPanel
}
from
'
vs/workbench/contrib/terminal/
electron-
browser/terminalPanel
'
;
import
{
TerminalPanel
}
from
'
vs/workbench/contrib/terminal/browser/terminalPanel
'
;
import
{
TerminalPickerHandler
}
from
'
vs/workbench/contrib/terminal/browser/terminalQuickOpen
'
;
import
{
setupTerminalCommands
,
TERMINAL_COMMAND_ID
}
from
'
vs/workbench/contrib/terminal/common/terminalCommands
'
;
import
{
setupTerminalMenu
}
from
'
vs/workbench/contrib/terminal/common/terminalMenu
'
;
...
...
src/vs/workbench/contrib/terminal/electron-browser/terminalService.ts
浏览文件 @
3760c273
...
...
@@ -18,7 +18,7 @@ import { TerminalConfigHelper } from 'vs/workbench/contrib/terminal/electron-bro
import
Severity
from
'
vs/base/common/severity
'
;
import
{
IStorageService
,
StorageScope
}
from
'
vs/platform/storage/common/storage
'
;
import
{
getDefaultShell
}
from
'
vs/workbench/contrib/terminal/node/terminal
'
;
import
{
TerminalPanel
}
from
'
vs/workbench/contrib/terminal/
electron-
browser/terminalPanel
'
;
import
{
TerminalPanel
}
from
'
vs/workbench/contrib/terminal/browser/terminalPanel
'
;
import
{
TerminalTab
}
from
'
vs/workbench/contrib/terminal/browser/terminalTab
'
;
import
{
IDialogService
}
from
'
vs/platform/dialogs/common/dialogs
'
;
import
{
INotificationService
}
from
'
vs/platform/notification/common/notification
'
;
...
...
src/vs/workbench/workbench.main.ts
浏览文件 @
3760c273
...
...
@@ -154,7 +154,7 @@ import 'vs/workbench/contrib/output/browser/outputPanel';
// Terminal
import
'
vs/workbench/contrib/terminal/electron-browser/terminal.contribution
'
;
import
'
vs/workbench/contrib/terminal/browser/terminalQuickOpen
'
;
import
'
vs/workbench/contrib/terminal/
electron-
browser/terminalPanel
'
;
import
'
vs/workbench/contrib/terminal/browser/terminalPanel
'
;
// Relauncher
import
'
vs/workbench/contrib/relauncher/electron-browser/relauncher.contribution
'
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录