Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
37c7bdb4
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,发现更多精彩内容 >>
提交
37c7bdb4
编写于
4月 30, 2018
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Eliminate CommonCodeEditor
上级
6c819481
变更
7
展开全部
隐藏空白更改
内联
并排
Showing
7 changed file
with
1265 addition
and
1342 deletion
+1265
-1342
src/vs/editor/browser/view/viewController.ts
src/vs/editor/browser/view/viewController.ts
+3
-3
src/vs/editor/browser/view/viewImpl.ts
src/vs/editor/browser/view/viewImpl.ts
+2
-2
src/vs/editor/browser/widget/codeEditorWidget.ts
src/vs/editor/browser/widget/codeEditorWidget.ts
+1251
-64
src/vs/editor/common/commonCodeEditor.ts
src/vs/editor/common/commonCodeEditor.ts
+0
-1270
src/vs/editor/common/config/commonEditorConfig.ts
src/vs/editor/common/config/commonEditorConfig.ts
+3
-0
src/vs/editor/common/editorCommon.ts
src/vs/editor/common/editorCommon.ts
+5
-1
src/vs/editor/test/browser/testCodeEditor.ts
src/vs/editor/test/browser/testCodeEditor.ts
+1
-2
未找到文件。
src/vs/editor/browser/view/viewController.ts
浏览文件 @
37c7bdb4
...
@@ -11,7 +11,7 @@ import { IEditorMouseEvent } from 'vs/editor/browser/editorBrowser';
...
@@ -11,7 +11,7 @@ import { IEditorMouseEvent } from 'vs/editor/browser/editorBrowser';
import
{
IViewModel
}
from
'
vs/editor/common/viewModel/viewModel
'
;
import
{
IViewModel
}
from
'
vs/editor/common/viewModel/viewModel
'
;
import
{
ViewOutgoingEvents
}
from
'
vs/editor/browser/view/viewOutgoingEvents
'
;
import
{
ViewOutgoingEvents
}
from
'
vs/editor/browser/view/viewOutgoingEvents
'
;
import
{
CoreNavigationCommands
,
CoreEditorCommand
}
from
'
vs/editor/browser/controller/coreCommands
'
;
import
{
CoreNavigationCommands
,
CoreEditorCommand
}
from
'
vs/editor/browser/controller/coreCommands
'
;
import
{
Configuration
}
from
'
vs/editor/browser/config/configurati
on
'
;
import
{
IConfiguration
}
from
'
vs/editor/common/editorComm
on
'
;
export
interface
ExecCoreEditorCommandFunc
{
export
interface
ExecCoreEditorCommandFunc
{
(
editorCommand
:
CoreEditorCommand
,
args
:
any
):
void
;
(
editorCommand
:
CoreEditorCommand
,
args
:
any
):
void
;
...
@@ -47,14 +47,14 @@ export interface ICommandDelegate {
...
@@ -47,14 +47,14 @@ export interface ICommandDelegate {
export
class
ViewController
{
export
class
ViewController
{
private
readonly
configuration
:
Configuration
;
private
readonly
configuration
:
I
Configuration
;
private
readonly
viewModel
:
IViewModel
;
private
readonly
viewModel
:
IViewModel
;
private
readonly
_execCoreEditorCommandFunc
:
ExecCoreEditorCommandFunc
;
private
readonly
_execCoreEditorCommandFunc
:
ExecCoreEditorCommandFunc
;
private
readonly
outgoingEvents
:
ViewOutgoingEvents
;
private
readonly
outgoingEvents
:
ViewOutgoingEvents
;
private
readonly
commandDelegate
:
ICommandDelegate
;
private
readonly
commandDelegate
:
ICommandDelegate
;
constructor
(
constructor
(
configuration
:
Configuration
,
configuration
:
I
Configuration
,
viewModel
:
IViewModel
,
viewModel
:
IViewModel
,
execCommandFunc
:
ExecCoreEditorCommandFunc
,
execCommandFunc
:
ExecCoreEditorCommandFunc
,
outgoingEvents
:
ViewOutgoingEvents
,
outgoingEvents
:
ViewOutgoingEvents
,
...
...
src/vs/editor/browser/view/viewImpl.ts
浏览文件 @
37c7bdb4
...
@@ -10,7 +10,7 @@ import * as dom from 'vs/base/browser/dom';
...
@@ -10,7 +10,7 @@ import * as dom from 'vs/base/browser/dom';
import
{
FastDomNode
,
createFastDomNode
}
from
'
vs/base/browser/fastDomNode
'
;
import
{
FastDomNode
,
createFastDomNode
}
from
'
vs/base/browser/fastDomNode
'
;
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
import
{
ViewEventHandler
}
from
'
vs/editor/common/viewModel/viewEventHandler
'
;
import
{
ViewEventHandler
}
from
'
vs/editor/common/viewModel/viewEventHandler
'
;
import
{
Configuration
}
from
'
vs/editor/browser/config/configurati
on
'
;
import
{
IConfiguration
}
from
'
vs/editor/common/editorComm
on
'
;
import
{
TextAreaHandler
,
ITextAreaHandlerHelper
}
from
'
vs/editor/browser/controller/textAreaHandler
'
;
import
{
TextAreaHandler
,
ITextAreaHandlerHelper
}
from
'
vs/editor/browser/controller/textAreaHandler
'
;
import
{
PointerHandler
}
from
'
vs/editor/browser/controller/pointerHandler
'
;
import
{
PointerHandler
}
from
'
vs/editor/browser/controller/pointerHandler
'
;
import
*
as
editorBrowser
from
'
vs/editor/browser/editorBrowser
'
;
import
*
as
editorBrowser
from
'
vs/editor/browser/editorBrowser
'
;
...
@@ -93,7 +93,7 @@ export class View extends ViewEventHandler {
...
@@ -93,7 +93,7 @@ export class View extends ViewEventHandler {
constructor
(
constructor
(
commandDelegate
:
ICommandDelegate
,
commandDelegate
:
ICommandDelegate
,
configuration
:
Configuration
,
configuration
:
I
Configuration
,
themeService
:
IThemeService
,
themeService
:
IThemeService
,
model
:
IViewModel
,
model
:
IViewModel
,
cursor
:
Cursor
,
cursor
:
Cursor
,
...
...
src/vs/editor/browser/widget/codeEditorWidget.ts
浏览文件 @
37c7bdb4
此差异已折叠。
点击以展开。
src/vs/editor/common/commonCodeEditor.ts
已删除
100644 → 0
浏览文件 @
6c819481
此差异已折叠。
点击以展开。
src/vs/editor/common/config/commonEditorConfig.ts
浏览文件 @
37c7bdb4
...
@@ -90,6 +90,9 @@ export abstract class CommonEditorConfiguration extends Disposable implements ed
...
@@ -90,6 +90,9 @@ export abstract class CommonEditorConfiguration extends Disposable implements ed
this
.
_register
(
TabFocus
.
onDidChangeTabFocus
(
_
=>
this
.
_recomputeOptions
()));
this
.
_register
(
TabFocus
.
onDidChangeTabFocus
(
_
=>
this
.
_recomputeOptions
()));
}
}
public
observeReferenceElement
(
dimension
?:
editorCommon
.
IDimension
):
void
{
}
public
dispose
():
void
{
public
dispose
():
void
{
super
.
dispose
();
super
.
dispose
();
}
}
...
...
src/vs/editor/common/editorCommon.ts
浏览文件 @
37c7bdb4
...
@@ -150,12 +150,16 @@ export interface ILineChange extends IChange {
...
@@ -150,12 +150,16 @@ export interface ILineChange extends IChange {
/**
/**
* @internal
* @internal
*/
*/
export
interface
IConfiguration
{
export
interface
IConfiguration
extends
IDisposable
{
onDidChange
(
listener
:
(
e
:
editorOptions
.
IConfigurationChangedEvent
)
=>
void
):
IDisposable
;
onDidChange
(
listener
:
(
e
:
editorOptions
.
IConfigurationChangedEvent
)
=>
void
):
IDisposable
;
readonly
editor
:
editorOptions
.
InternalEditorOptions
;
readonly
editor
:
editorOptions
.
InternalEditorOptions
;
setMaxLineNumber
(
maxLineNumber
:
number
):
void
;
setMaxLineNumber
(
maxLineNumber
:
number
):
void
;
updateOptions
(
newOptions
:
editorOptions
.
IEditorOptions
):
void
;
getRawOptions
():
editorOptions
.
IEditorOptions
;
observeReferenceElement
(
dimension
?:
IDimension
):
void
;
setIsDominatedByLongLines
(
isDominatedByLongLines
:
boolean
):
void
;
}
}
// --- view
// --- view
...
...
src/vs/editor/test/browser/testCodeEditor.ts
浏览文件 @
37c7bdb4
...
@@ -8,7 +8,6 @@ import { ServiceCollection } from 'vs/platform/instantiation/common/serviceColle
...
@@ -8,7 +8,6 @@ import { ServiceCollection } from 'vs/platform/instantiation/common/serviceColle
import
{
InstantiationService
}
from
'
vs/platform/instantiation/common/instantiationService
'
;
import
{
InstantiationService
}
from
'
vs/platform/instantiation/common/instantiationService
'
;
import
{
IContextKeyService
,
IContextKeyServiceTarget
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
IContextKeyService
,
IContextKeyServiceTarget
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
MockContextKeyService
}
from
'
vs/platform/keybinding/test/common/mockKeybindingService
'
;
import
{
MockContextKeyService
}
from
'
vs/platform/keybinding/test/common/mockKeybindingService
'
;
import
{
CommonEditorConfiguration
}
from
'
vs/editor/common/config/commonEditorConfig
'
;
import
{
Cursor
}
from
'
vs/editor/common/controller/cursor
'
;
import
{
Cursor
}
from
'
vs/editor/common/controller/cursor
'
;
import
*
as
editorCommon
from
'
vs/editor/common/editorCommon
'
;
import
*
as
editorCommon
from
'
vs/editor/common/editorCommon
'
;
import
*
as
editorBrowser
from
'
vs/editor/browser/editorBrowser
'
;
import
*
as
editorBrowser
from
'
vs/editor/browser/editorBrowser
'
;
...
@@ -37,7 +36,7 @@ export class TestCodeEditor extends CodeEditorWidget implements editorBrowser.IC
...
@@ -37,7 +36,7 @@ export class TestCodeEditor extends CodeEditorWidget implements editorBrowser.IC
}
}
//#region testing overrides
//#region testing overrides
protected
_createConfiguration
(
options
:
editorOptions
.
IEditorOptions
):
CommonEditor
Configuration
{
protected
_createConfiguration
(
options
:
editorOptions
.
IEditorOptions
):
editorCommon
.
I
Configuration
{
return
new
TestConfiguration
(
options
);
return
new
TestConfiguration
(
options
);
}
}
protected
_createView
():
void
{
protected
_createView
():
void
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录