Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
c339a560
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,发现更多精彩内容 >>
提交
c339a560
编写于
9月 04, 2019
作者:
P
Peng Lyu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
optional clipboard service for diff editor widget.
上级
71754fbb
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
12 addition
and
11 deletion
+12
-11
src/vs/editor/browser/widget/diffEditorWidget.ts
src/vs/editor/browser/widget/diffEditorWidget.ts
+3
-3
src/vs/editor/browser/widget/embeddedCodeEditorWidget.ts
src/vs/editor/browser/widget/embeddedCodeEditorWidget.ts
+1
-1
src/vs/editor/standalone/browser/standaloneCodeEditor.ts
src/vs/editor/standalone/browser/standaloneCodeEditor.ts
+3
-3
src/vs/editor/standalone/browser/standaloneEditor.ts
src/vs/editor/standalone/browser/standaloneEditor.ts
+1
-2
src/vs/workbench/browser/parts/editor/textDiffEditor.ts
src/vs/workbench/browser/parts/editor/textDiffEditor.ts
+4
-2
未找到文件。
src/vs/editor/browser/widget/diffEditorWidget.ts
浏览文件 @
c339a560
...
@@ -79,7 +79,7 @@ class VisualEditorState {
...
@@ -79,7 +79,7 @@ class VisualEditorState {
constructor
(
constructor
(
private
_contextMenuService
:
IContextMenuService
,
private
_contextMenuService
:
IContextMenuService
,
private
_clipboardService
:
IClipboardService
private
_clipboardService
:
IClipboardService
|
null
)
{
)
{
this
.
_zones
=
[];
this
.
_zones
=
[];
this
.
inlineDiffMargins
=
[];
this
.
inlineDiffMargins
=
[];
...
@@ -129,7 +129,7 @@ class VisualEditorState {
...
@@ -129,7 +129,7 @@ class VisualEditorState {
this
.
_zones
.
push
(
zoneId
);
this
.
_zones
.
push
(
zoneId
);
this
.
_zonesMap
[
String
(
zoneId
)]
=
true
;
this
.
_zonesMap
[
String
(
zoneId
)]
=
true
;
if
(
newDecorations
.
zones
[
i
].
diff
&&
viewZone
.
marginDomNode
)
{
if
(
newDecorations
.
zones
[
i
].
diff
&&
viewZone
.
marginDomNode
&&
this
.
_clipboardService
)
{
this
.
inlineDiffMargins
.
push
(
new
InlineDiffMargin
(
zoneId
,
viewZone
.
marginDomNode
,
editor
,
newDecorations
.
zones
[
i
].
diff
!
,
this
.
_contextMenuService
,
this
.
_clipboardService
));
this
.
inlineDiffMargins
.
push
(
new
InlineDiffMargin
(
zoneId
,
viewZone
.
marginDomNode
,
editor
,
newDecorations
.
zones
[
i
].
diff
!
,
this
.
_contextMenuService
,
this
.
_clipboardService
));
}
}
}
}
...
@@ -214,6 +214,7 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
...
@@ -214,6 +214,7 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
constructor
(
constructor
(
domElement
:
HTMLElement
,
domElement
:
HTMLElement
,
options
:
editorOptions
.
IDiffEditorOptions
,
options
:
editorOptions
.
IDiffEditorOptions
,
clipboardService
:
IClipboardService
|
null
,
@
IEditorWorkerService
editorWorkerService
:
IEditorWorkerService
,
@
IEditorWorkerService
editorWorkerService
:
IEditorWorkerService
,
@
IContextKeyService
contextKeyService
:
IContextKeyService
,
@
IContextKeyService
contextKeyService
:
IContextKeyService
,
@
IInstantiationService
instantiationService
:
IInstantiationService
,
@
IInstantiationService
instantiationService
:
IInstantiationService
,
...
@@ -221,7 +222,6 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
...
@@ -221,7 +222,6 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
@
IThemeService
themeService
:
IThemeService
,
@
IThemeService
themeService
:
IThemeService
,
@
INotificationService
notificationService
:
INotificationService
,
@
INotificationService
notificationService
:
INotificationService
,
@
IContextMenuService
contextMenuService
:
IContextMenuService
,
@
IContextMenuService
contextMenuService
:
IContextMenuService
,
@
IClipboardService
clipboardService
:
IClipboardService
)
{
)
{
super
();
super
();
...
...
src/vs/editor/browser/widget/embeddedCodeEditorWidget.ts
浏览文件 @
c339a560
...
@@ -80,7 +80,7 @@ export class EmbeddedDiffEditorWidget extends DiffEditorWidget {
...
@@ -80,7 +80,7 @@ export class EmbeddedDiffEditorWidget extends DiffEditorWidget {
@
IContextMenuService
contextMenuService
:
IContextMenuService
,
@
IContextMenuService
contextMenuService
:
IContextMenuService
,
@
IClipboardService
clipboardService
:
IClipboardService
@
IClipboardService
clipboardService
:
IClipboardService
)
{
)
{
super
(
domElement
,
parentEditor
.
getRawConfiguration
(),
editorWorkerService
,
contextKeyService
,
instantiationService
,
codeEditorService
,
themeService
,
notificationService
,
contextMenuService
,
clipboard
Service
);
super
(
domElement
,
parentEditor
.
getRawConfiguration
(),
clipboardService
,
editorWorkerService
,
contextKeyService
,
instantiationService
,
codeEditorService
,
themeService
,
notificationService
,
contextMenu
Service
);
this
.
_parentEditor
=
parentEditor
;
this
.
_parentEditor
=
parentEditor
;
this
.
_overwriteOptions
=
options
;
this
.
_overwriteOptions
=
options
;
...
...
src/vs/editor/standalone/browser/standaloneCodeEditor.ts
浏览文件 @
c339a560
...
@@ -23,7 +23,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
...
@@ -23,7 +23,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
import
{
ContextKeyExpr
,
IContextKey
,
IContextKeyService
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
ContextKeyExpr
,
IContextKey
,
IContextKeyService
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
IContextViewService
,
IContextMenuService
}
from
'
vs/platform/contextview/browser/contextView
'
;
import
{
IContextViewService
,
IContextMenuService
}
from
'
vs/platform/contextview/browser/contextView
'
;
import
{
ContextViewService
}
from
'
vs/platform/contextview/browser/contextViewService
'
;
import
{
ContextViewService
}
from
'
vs/platform/contextview/browser/contextViewService
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
IInstantiationService
,
optional
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
IKeybindingService
}
from
'
vs/platform/keybinding/common/keybinding
'
;
import
{
IKeybindingService
}
from
'
vs/platform/keybinding/common/keybinding
'
;
import
{
INotificationService
}
from
'
vs/platform/notification/common/notification
'
;
import
{
INotificationService
}
from
'
vs/platform/notification/common/notification
'
;
import
{
IThemeService
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
IThemeService
}
from
'
vs/platform/theme/common/themeService
'
;
...
@@ -376,7 +376,7 @@ export class StandaloneDiffEditor extends DiffEditorWidget implements IStandalon
...
@@ -376,7 +376,7 @@ export class StandaloneDiffEditor extends DiffEditorWidget implements IStandalon
@
INotificationService
notificationService
:
INotificationService
,
@
INotificationService
notificationService
:
INotificationService
,
@
IConfigurationService
configurationService
:
IConfigurationService
,
@
IConfigurationService
configurationService
:
IConfigurationService
,
@
IContextMenuService
contextMenuService
:
IContextMenuService
,
@
IContextMenuService
contextMenuService
:
IContextMenuService
,
@
IClipboardService
clipboardService
:
IClipboardService
@
optional
(
IClipboardService
)
clipboardService
:
IClipboardService
|
null
,
)
{
)
{
applyConfigurationValues
(
configurationService
,
options
,
true
);
applyConfigurationValues
(
configurationService
,
options
,
true
);
options
=
options
||
{};
options
=
options
||
{};
...
@@ -384,7 +384,7 @@ export class StandaloneDiffEditor extends DiffEditorWidget implements IStandalon
...
@@ -384,7 +384,7 @@ export class StandaloneDiffEditor extends DiffEditorWidget implements IStandalon
options
.
theme
=
themeService
.
setTheme
(
options
.
theme
);
options
.
theme
=
themeService
.
setTheme
(
options
.
theme
);
}
}
super
(
domElement
,
options
,
editorWorkerService
,
contextKeyService
,
instantiationService
,
codeEditorService
,
themeService
,
notificationService
,
contextMenuService
,
clipboard
Service
);
super
(
domElement
,
options
,
clipboardService
,
editorWorkerService
,
contextKeyService
,
instantiationService
,
codeEditorService
,
themeService
,
notificationService
,
contextMenu
Service
);
this
.
_contextViewService
=
<
ContextViewService
>
contextViewService
;
this
.
_contextViewService
=
<
ContextViewService
>
contextViewService
;
this
.
_configurationService
=
configurationService
;
this
.
_configurationService
=
configurationService
;
...
...
src/vs/editor/standalone/browser/standaloneEditor.ts
浏览文件 @
c339a560
...
@@ -38,7 +38,6 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
...
@@ -38,7 +38,6 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
import
{
IOpenerService
}
from
'
vs/platform/opener/common/opener
'
;
import
{
IOpenerService
}
from
'
vs/platform/opener/common/opener
'
;
import
{
IAccessibilityService
}
from
'
vs/platform/accessibility/common/accessibility
'
;
import
{
IAccessibilityService
}
from
'
vs/platform/accessibility/common/accessibility
'
;
import
{
clearAllFontInfos
}
from
'
vs/editor/browser/config/configuration
'
;
import
{
clearAllFontInfos
}
from
'
vs/editor/browser/config/configuration
'
;
import
{
IClipboardService
}
from
'
vs/platform/clipboard/common/clipboardService
'
;
type
Omit
<
T
,
K
extends
keyof
T
>
=
Pick
<
T
,
Exclude
<
keyof
T
,
K
>>
;
type
Omit
<
T
,
K
extends
keyof
T
>
=
Pick
<
T
,
Exclude
<
keyof
T
,
K
>>
;
...
@@ -121,7 +120,7 @@ export function createDiffEditor(domElement: HTMLElement, options?: IDiffEditorC
...
@@ -121,7 +120,7 @@ export function createDiffEditor(domElement: HTMLElement, options?: IDiffEditorC
services
.
get
(
INotificationService
),
services
.
get
(
INotificationService
),
services
.
get
(
IConfigurationService
),
services
.
get
(
IConfigurationService
),
services
.
get
(
IContextMenuService
),
services
.
get
(
IContextMenuService
),
services
.
get
(
IClipboardService
)
null
);
);
});
});
}
}
...
...
src/vs/workbench/browser/parts/editor/textDiffEditor.ts
浏览文件 @
c339a560
...
@@ -32,6 +32,7 @@ import { CancellationToken } from 'vs/base/common/cancellation';
...
@@ -32,6 +32,7 @@ import { CancellationToken } from 'vs/base/common/cancellation';
import
{
EditorMemento
}
from
'
vs/workbench/browser/parts/editor/baseEditor
'
;
import
{
EditorMemento
}
from
'
vs/workbench/browser/parts/editor/baseEditor
'
;
import
{
IWindowService
}
from
'
vs/platform/windows/common/windows
'
;
import
{
IWindowService
}
from
'
vs/platform/windows/common/windows
'
;
import
{
EditorActivation
}
from
'
vs/platform/editor/common/editor
'
;
import
{
EditorActivation
}
from
'
vs/platform/editor/common/editor
'
;
import
{
IClipboardService
}
from
'
vs/platform/clipboard/common/clipboardService
'
;
/**
/**
* The text editor that leverages the diff text editor for the editing experience.
* The text editor that leverages the diff text editor for the editing experience.
...
@@ -52,7 +53,8 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
...
@@ -52,7 +53,8 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
@
IThemeService
themeService
:
IThemeService
,
@
IThemeService
themeService
:
IThemeService
,
@
IEditorGroupsService
editorGroupService
:
IEditorGroupsService
,
@
IEditorGroupsService
editorGroupService
:
IEditorGroupsService
,
@
ITextFileService
textFileService
:
ITextFileService
,
@
ITextFileService
textFileService
:
ITextFileService
,
@
IWindowService
windowService
:
IWindowService
@
IWindowService
windowService
:
IWindowService
,
@
IClipboardService
private
_clipboardService
:
IClipboardService
,
)
{
)
{
super
(
TextDiffEditor
.
ID
,
telemetryService
,
instantiationService
,
storageService
,
configurationService
,
themeService
,
textFileService
,
editorService
,
editorGroupService
,
windowService
);
super
(
TextDiffEditor
.
ID
,
telemetryService
,
instantiationService
,
storageService
,
configurationService
,
themeService
,
textFileService
,
editorService
,
editorGroupService
,
windowService
);
}
}
...
@@ -70,7 +72,7 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
...
@@ -70,7 +72,7 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditor {
}
}
createEditorControl
(
parent
:
HTMLElement
,
configuration
:
ICodeEditorOptions
):
IDiffEditor
{
createEditorControl
(
parent
:
HTMLElement
,
configuration
:
ICodeEditorOptions
):
IDiffEditor
{
return
this
.
instantiationService
.
createInstance
(
DiffEditorWidget
,
parent
,
configuration
);
return
this
.
instantiationService
.
createInstance
(
DiffEditorWidget
,
parent
,
configuration
,
this
.
_clipboardService
);
}
}
async
setInput
(
input
:
EditorInput
,
options
:
EditorOptions
,
token
:
CancellationToken
):
Promise
<
void
>
{
async
setInput
(
input
:
EditorInput
,
options
:
EditorOptions
,
token
:
CancellationToken
):
Promise
<
void
>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录