Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
e3f908a2
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,发现更多精彩内容 >>
未验证
提交
e3f908a2
编写于
7月 10, 2020
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix layering: Move IEditorConstructionOptions to /browser/
上级
5ab5f966
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
34 addition
and
34 deletion
+34
-34
src/vs/editor/browser/config/configuration.ts
src/vs/editor/browser/config/configuration.ts
+2
-1
src/vs/editor/browser/editorBrowser.ts
src/vs/editor/browser/editorBrowser.ts
+12
-0
src/vs/editor/browser/widget/codeEditorWidget.ts
src/vs/editor/browser/widget/codeEditorWidget.ts
+3
-3
src/vs/editor/common/config/editorOptions.ts
src/vs/editor/common/config/editorOptions.ts
+0
-13
src/vs/editor/standalone/browser/standaloneCodeEditor.ts
src/vs/editor/standalone/browser/standaloneCodeEditor.ts
+2
-2
src/vs/editor/test/browser/testCodeEditor.ts
src/vs/editor/test/browser/testCodeEditor.ts
+2
-2
src/vs/monaco.d.ts
src/vs/monaco.d.ts
+12
-12
src/vs/workbench/contrib/scm/browser/scmViewPane.ts
src/vs/workbench/contrib/scm/browser/scmViewPane.ts
+1
-1
未找到文件。
src/vs/editor/browser/config/configuration.ts
浏览文件 @
e3f908a2
...
...
@@ -11,10 +11,11 @@ import * as platform from 'vs/base/common/platform';
import
{
CharWidthRequest
,
CharWidthRequestType
,
readCharWidths
}
from
'
vs/editor/browser/config/charWidthReader
'
;
import
{
ElementSizeObserver
}
from
'
vs/editor/browser/config/elementSizeObserver
'
;
import
{
CommonEditorConfiguration
,
IEnvConfiguration
}
from
'
vs/editor/common/config/commonEditorConfig
'
;
import
{
EditorOption
,
IEditorConstructionOptions
,
EditorFontLigatures
}
from
'
vs/editor/common/config/editorOptions
'
;
import
{
EditorOption
,
EditorFontLigatures
}
from
'
vs/editor/common/config/editorOptions
'
;
import
{
BareFontInfo
,
FontInfo
}
from
'
vs/editor/common/config/fontInfo
'
;
import
{
IDimension
}
from
'
vs/editor/common/editorCommon
'
;
import
{
IAccessibilityService
,
AccessibilitySupport
}
from
'
vs/platform/accessibility/common/accessibility
'
;
import
{
IEditorConstructionOptions
}
from
'
vs/editor/browser/editorBrowser
'
;
class
CSSBasedConfigurationCache
{
...
...
src/vs/editor/browser/editorBrowser.ts
浏览文件 @
e3f908a2
...
...
@@ -336,6 +336,18 @@ export interface IEditorAriaOptions {
role
?:
string
;
}
export
interface
IEditorConstructionOptions
extends
IEditorOptions
{
/**
* The initial editor dimension (to avoid measuring the container).
*/
dimension
?:
editorCommon
.
IDimension
;
/**
* Place overflow widgets inside an external DOM node.
* Defaults to an internal DOM node.
*/
overflowWidgetsDomNode
?:
HTMLElement
;
}
/**
* A rich code editor.
*/
...
...
src/vs/editor/browser/widget/codeEditorWidget.ts
浏览文件 @
e3f908a2
...
...
@@ -21,7 +21,7 @@ import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService
import
{
ICommandDelegate
}
from
'
vs/editor/browser/view/viewController
'
;
import
{
IContentWidgetData
,
IOverlayWidgetData
,
View
}
from
'
vs/editor/browser/view/viewImpl
'
;
import
{
ViewUserInputEvents
}
from
'
vs/editor/browser/view/viewUserInputEvents
'
;
import
{
ConfigurationChangedEvent
,
EditorLayoutInfo
,
IEditorOptions
,
EditorOption
,
IComputedEditorOptions
,
FindComputedEditorOptionValueById
,
IEditorConstructionOptions
,
filterValidationDecorations
}
from
'
vs/editor/common/config/editorOptions
'
;
import
{
ConfigurationChangedEvent
,
EditorLayoutInfo
,
IEditorOptions
,
EditorOption
,
IComputedEditorOptions
,
FindComputedEditorOptionValueById
,
filterValidationDecorations
}
from
'
vs/editor/common/config/editorOptions
'
;
import
{
Cursor
}
from
'
vs/editor/common/controller/cursor
'
;
import
{
CursorColumns
}
from
'
vs/editor/common/controller/cursorCommon
'
;
import
{
ICursorPositionChangedEvent
,
ICursorSelectionChangedEvent
}
from
'
vs/editor/common/controller/cursorEvents
'
;
...
...
@@ -238,7 +238,7 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
constructor
(
domElement
:
HTMLElement
,
options
:
IEditorConstructionOptions
,
options
:
editorBrowser
.
IEditorConstructionOptions
,
codeEditorWidgetOptions
:
ICodeEditorWidgetOptions
,
@
IInstantiationService
instantiationService
:
IInstantiationService
,
@
ICodeEditorService
codeEditorService
:
ICodeEditorService
,
...
...
@@ -328,7 +328,7 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
this
.
_codeEditorService
.
addCodeEditor
(
this
);
}
protected
_createConfiguration
(
options
:
IEditorConstructionOptions
,
accessibilityService
:
IAccessibilityService
):
editorCommon
.
IConfiguration
{
protected
_createConfiguration
(
options
:
editorBrowser
.
IEditorConstructionOptions
,
accessibilityService
:
IAccessibilityService
):
editorCommon
.
IConfiguration
{
return
new
Configuration
(
this
.
isSimpleWidget
,
options
,
this
.
_domElement
,
accessibilityService
);
}
...
...
src/vs/editor/common/config/editorOptions.ts
浏览文件 @
e3f908a2
...
...
@@ -11,7 +11,6 @@ import { Constants } from 'vs/base/common/uint';
import
{
USUAL_WORD_SEPARATORS
}
from
'
vs/editor/common/model/wordHelper
'
;
import
{
AccessibilitySupport
}
from
'
vs/platform/accessibility/common/accessibility
'
;
import
{
IConfigurationPropertySchema
}
from
'
vs/platform/configuration/common/configurationRegistry
'
;
import
{
IDimension
}
from
'
vs/editor/common/editorCommon
'
;
import
{
IJSONSchema
}
from
'
vs/base/common/jsonSchema
'
;
//#region typed options
...
...
@@ -600,18 +599,6 @@ export interface IEditorOptions {
showDeprecated
?:
boolean
;
}
export
interface
IEditorConstructionOptions
extends
IEditorOptions
{
/**
* The initial editor dimension (to avoid measuring the container).
*/
dimension
?:
IDimension
;
/**
* Place overflow widgets inside an external DOM node.
* Defaults to an internal DOM node.
*/
overflowWidgetsDomNode
?:
HTMLElement
;
}
/**
* @internal
* The width of the minimap gutter, in pixels.
...
...
src/vs/editor/standalone/browser/standaloneCodeEditor.ts
浏览文件 @
e3f908a2
...
...
@@ -5,11 +5,11 @@
import
*
as
aria
from
'
vs/base/browser/ui/aria/aria
'
;
import
{
Disposable
,
IDisposable
,
toDisposable
,
DisposableStore
}
from
'
vs/base/common/lifecycle
'
;
import
{
ICodeEditor
,
IDiffEditor
}
from
'
vs/editor/browser/editorBrowser
'
;
import
{
ICodeEditor
,
IDiffEditor
,
IEditorConstructionOptions
}
from
'
vs/editor/browser/editorBrowser
'
;
import
{
ICodeEditorService
}
from
'
vs/editor/browser/services/codeEditorService
'
;
import
{
CodeEditorWidget
}
from
'
vs/editor/browser/widget/codeEditorWidget
'
;
import
{
DiffEditorWidget
}
from
'
vs/editor/browser/widget/diffEditorWidget
'
;
import
{
IDiffEditorOptions
,
IEditorOptions
,
IEditorConstructionOptions
}
from
'
vs/editor/common/config/editorOptions
'
;
import
{
IDiffEditorOptions
,
IEditorOptions
}
from
'
vs/editor/common/config/editorOptions
'
;
import
{
InternalEditorAction
}
from
'
vs/editor/common/editorAction
'
;
import
{
IModelChangedEvent
}
from
'
vs/editor/common/editorCommon
'
;
import
{
ITextModel
}
from
'
vs/editor/common/model
'
;
...
...
src/vs/editor/test/browser/testCodeEditor.ts
浏览文件 @
e3f908a2
...
...
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import
{
ICodeEditor
,
IActiveCodeEditor
}
from
'
vs/editor/browser/editorBrowser
'
;
import
{
ICodeEditor
,
IActiveCodeEditor
,
IEditorConstructionOptions
}
from
'
vs/editor/browser/editorBrowser
'
;
import
{
IEditorContributionCtor
}
from
'
vs/editor/browser/editorExtensions
'
;
import
{
ICodeEditorService
}
from
'
vs/editor/browser/services/codeEditorService
'
;
import
{
View
}
from
'
vs/editor/browser/view/viewImpl
'
;
...
...
@@ -34,7 +34,7 @@ export interface ITestCodeEditor extends IActiveCodeEditor {
class
TestCodeEditor
extends
CodeEditorWidget
implements
ICodeEditor
{
//#region testing overrides
protected
_createConfiguration
(
options
:
editorOptions
.
IEditorConstructionOptions
):
IConfiguration
{
protected
_createConfiguration
(
options
:
IEditorConstructionOptions
):
IConfiguration
{
return
new
TestConfiguration
(
options
);
}
protected
_createView
(
viewModel
:
ViewModel
):
[
View
,
boolean
]
{
...
...
src/vs/monaco.d.ts
浏览文件 @
e3f908a2
...
...
@@ -3138,18 +3138,6 @@ declare namespace monaco.editor {
showDeprecated
?:
boolean
;
}
export
interface
IEditorConstructionOptions
extends
IEditorOptions
{
/**
* The initial editor dimension (to avoid measuring the container).
*/
dimension
?:
IDimension
;
/**
* Place overflow widgets inside an external DOM node.
* Defaults to an internal DOM node.
*/
overflowWidgetsDomNode
?:
HTMLElement
;
}
/**
* Configuration options for the diff editor.
*/
...
...
@@ -4400,6 +4388,18 @@ declare namespace monaco.editor {
readonly
mode
:
string
|
null
;
}
export
interface
IEditorConstructionOptions
extends
IEditorOptions
{
/**
* The initial editor dimension (to avoid measuring the container).
*/
dimension
?:
IDimension
;
/**
* Place overflow widgets inside an external DOM node.
* Defaults to an internal DOM node.
*/
overflowWidgetsDomNode
?:
HTMLElement
;
}
/**
* A rich code editor.
*/
...
...
src/vs/workbench/contrib/scm/browser/scmViewPane.ts
浏览文件 @
e3f908a2
...
...
@@ -50,7 +50,7 @@ import { toResource, SideBySideEditor } from 'vs/workbench/common/editor';
import
{
SIDE_BAR_BACKGROUND
,
SIDE_BAR_BORDER
,
PANEL_BACKGROUND
,
PANEL_INPUT_BORDER
}
from
'
vs/workbench/common/theme
'
;
import
{
CodeEditorWidget
,
ICodeEditorWidgetOptions
}
from
'
vs/editor/browser/widget/codeEditorWidget
'
;
import
{
ITextModel
}
from
'
vs/editor/common/model
'
;
import
{
IEditorConstructionOptions
}
from
'
vs/editor/
common/config/editorOptions
'
;
import
{
IEditorConstructionOptions
}
from
'
vs/editor/
browser/editorBrowser
'
;
import
{
getSimpleEditorOptions
}
from
'
vs/workbench/contrib/codeEditor/browser/simpleEditorOptions
'
;
import
{
IModelService
}
from
'
vs/editor/common/services/modelService
'
;
import
{
EditorExtensionsRegistry
}
from
'
vs/editor/browser/editorExtensions
'
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录