Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
d672ffad
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,发现更多精彩内容 >>
提交
d672ffad
编写于
2月 24, 2017
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename minimap.renderText to minimap.renderCharacters (#20947)
上级
639558ef
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
30 addition
and
30 deletion
+30
-30
src/vs/editor/common/config/commonEditorConfig.ts
src/vs/editor/common/config/commonEditorConfig.ts
+5
-5
src/vs/editor/common/config/defaultConfig.ts
src/vs/editor/common/config/defaultConfig.ts
+1
-1
src/vs/editor/common/editorCommon.ts
src/vs/editor/common/editorCommon.ts
+5
-5
src/vs/editor/common/viewLayout/editorLayoutProvider.ts
src/vs/editor/common/viewLayout/editorLayoutProvider.ts
+4
-4
src/vs/editor/test/common/viewLayout/editorLayoutProvider.test.ts
...ditor/test/common/viewLayout/editorLayoutProvider.test.ts
+13
-13
src/vs/monaco.d.ts
src/vs/monaco.d.ts
+2
-2
未找到文件。
src/vs/editor/common/config/commonEditorConfig.ts
浏览文件 @
d672ffad
...
...
@@ -185,7 +185,7 @@ class InternalEditorOptionsHelper {
scrollbarArrowSize
:
scrollbar
.
arrowSize
,
verticalScrollbarHasArrows
:
scrollbar
.
verticalHasArrows
,
minimap
:
minimap
.
enabled
,
minimapRender
Text
:
minimap
.
renderText
,
minimapRender
Characters
:
minimap
.
renderCharacters
,
pixelRatio
:
pixelRatio
});
...
...
@@ -373,7 +373,7 @@ class InternalEditorOptionsHelper {
private
static
_sanitizeMinimapOpts
(
raw
:
editorCommon
.
IEditorMinimapOptions
):
editorCommon
.
InternalEditorMinimapOptions
{
return
new
editorCommon
.
InternalEditorMinimapOptions
({
enabled
:
toBooleanWithDefault
(
raw
.
enabled
,
false
),
render
Text
:
toBooleanWithDefault
(
raw
.
renderText
,
true
),
render
Characters
:
toBooleanWithDefault
(
raw
.
renderCharacters
,
true
),
});
}
}
...
...
@@ -672,10 +672,10 @@ const editorConfiguration: IConfigurationNode = {
'
default
'
:
DefaultConfig
.
editor
.
minimap
.
enabled
,
'
description
'
:
nls
.
localize
(
'
minimap.enabled
'
,
"
Controls if the minimap is shown
"
)
},
'
editor.minimap.render
Text
'
:
{
'
editor.minimap.render
Characters
'
:
{
'
type
'
:
'
boolean
'
,
'
default
'
:
DefaultConfig
.
editor
.
minimap
.
render
Text
,
'
description
'
:
nls
.
localize
(
'
minimap.render
Text
'
,
"
Render the actual text
on a line (as opposed to color blocks)
"
)
'
default
'
:
DefaultConfig
.
editor
.
minimap
.
render
Characters
,
'
description
'
:
nls
.
localize
(
'
minimap.render
Characters
'
,
"
Render the actual characters
on a line (as opposed to color blocks)
"
)
},
'
editor.wordWrap
'
:
{
'
type
'
:
'
string
'
,
...
...
src/vs/editor/common/config/defaultConfig.ts
浏览文件 @
d672ffad
...
...
@@ -58,7 +58,7 @@ class ConfigClass implements IConfiguration {
},
minimap
:
{
enabled
:
false
,
render
Text
:
true
render
Characters
:
true
},
fixedOverflowWidgets
:
false
,
overviewRulerLanes
:
2
,
...
...
src/vs/editor/common/editorCommon.ts
浏览文件 @
d672ffad
...
...
@@ -167,7 +167,7 @@ export interface IEditorMinimapOptions {
* Render the actual text on a line (as opposed to color blocks).
* Defaults to true.
*/
render
Text
?:
boolean
;
render
Characters
?:
boolean
;
}
/**
...
...
@@ -647,17 +647,17 @@ export class InternalEditorMinimapOptions {
readonly
_internalEditorMinimapOptionsBrand
:
void
;
readonly
enabled
:
boolean
;
readonly
render
Text
:
boolean
;
readonly
render
Characters
:
boolean
;
/**
* @internal
*/
constructor
(
source
:
{
enabled
:
boolean
;
render
Text
:
boolean
;
render
Characters
:
boolean
;
})
{
this
.
enabled
=
Boolean
(
source
.
enabled
);
this
.
render
Text
=
Boolean
(
source
.
renderText
);
this
.
render
Characters
=
Boolean
(
source
.
renderCharacters
);
}
/**
...
...
@@ -666,7 +666,7 @@ export class InternalEditorMinimapOptions {
public
equals
(
other
:
InternalEditorMinimapOptions
):
boolean
{
return
(
this
.
enabled
===
other
.
enabled
&&
this
.
render
Text
===
other
.
renderText
&&
this
.
render
Characters
===
other
.
renderCharacters
);
}
...
...
src/vs/editor/common/viewLayout/editorLayoutProvider.ts
浏览文件 @
d672ffad
...
...
@@ -28,7 +28,7 @@ export interface IEditorLayoutProviderOpts {
horizontalScrollbarHeight
:
number
;
minimap
:
boolean
;
minimapRender
Text
:
boolean
;
minimapRender
Characters
:
boolean
;
pixelRatio
:
number
;
}
...
...
@@ -49,7 +49,7 @@ export class EditorLayoutProvider {
const
scrollbarArrowSize
=
_opts
.
scrollbarArrowSize
|
0
;
const
horizontalScrollbarHeight
=
_opts
.
horizontalScrollbarHeight
|
0
;
const
minimap
=
Boolean
(
_opts
.
minimap
);
const
minimapRender
Text
=
Boolean
(
_opts
.
minimapRenderText
);
const
minimapRender
Characters
=
Boolean
(
_opts
.
minimapRenderCharacters
);
const
pixelRatio
=
Number
(
_opts
.
pixelRatio
);
let
lineNumbersWidth
=
0
;
...
...
@@ -80,10 +80,10 @@ export class EditorLayoutProvider {
}
else
{
let
minimapCharWidth
:
number
;
if
(
pixelRatio
>=
2
)
{
renderMinimap
=
minimapRender
Text
?
RenderMinimap
.
Large
:
RenderMinimap
.
LargeBlocks
;
renderMinimap
=
minimapRender
Characters
?
RenderMinimap
.
Large
:
RenderMinimap
.
LargeBlocks
;
minimapCharWidth
=
2
/
pixelRatio
;
}
else
{
renderMinimap
=
minimapRender
Text
?
RenderMinimap
.
Small
:
RenderMinimap
.
SmallBlocks
;
renderMinimap
=
minimapRender
Characters
?
RenderMinimap
.
Small
:
RenderMinimap
.
SmallBlocks
;
minimapCharWidth
=
1
/
pixelRatio
;
}
...
...
src/vs/editor/test/common/viewLayout/editorLayoutProvider.test.ts
浏览文件 @
d672ffad
...
...
@@ -32,7 +32,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => {
scrollbarArrowSize
:
0
,
verticalScrollbarHasArrows
:
false
,
minimap
:
false
,
minimapRender
Text
:
true
,
minimapRender
Characters
:
true
,
pixelRatio
:
1
,
},
new
EditorLayoutInfo
({
width
:
1000
,
...
...
@@ -87,7 +87,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => {
scrollbarArrowSize
:
13
,
verticalScrollbarHasArrows
:
true
,
minimap
:
false
,
minimapRender
Text
:
true
,
minimapRender
Characters
:
true
,
pixelRatio
:
1
,
},
new
EditorLayoutInfo
({
width
:
1000
,
...
...
@@ -142,7 +142,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => {
scrollbarArrowSize
:
0
,
verticalScrollbarHasArrows
:
false
,
minimap
:
false
,
minimapRender
Text
:
true
,
minimapRender
Characters
:
true
,
pixelRatio
:
1
,
},
new
EditorLayoutInfo
({
width
:
900
,
...
...
@@ -197,7 +197,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => {
scrollbarArrowSize
:
0
,
verticalScrollbarHasArrows
:
false
,
minimap
:
false
,
minimapRender
Text
:
true
,
minimapRender
Characters
:
true
,
pixelRatio
:
1
,
},
new
EditorLayoutInfo
({
width
:
900
,
...
...
@@ -252,7 +252,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => {
scrollbarArrowSize
:
0
,
verticalScrollbarHasArrows
:
false
,
minimap
:
false
,
minimapRender
Text
:
true
,
minimapRender
Characters
:
true
,
pixelRatio
:
1
,
},
new
EditorLayoutInfo
({
width
:
900
,
...
...
@@ -307,7 +307,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => {
scrollbarArrowSize
:
0
,
verticalScrollbarHasArrows
:
false
,
minimap
:
false
,
minimapRender
Text
:
true
,
minimapRender
Characters
:
true
,
pixelRatio
:
1
,
},
new
EditorLayoutInfo
({
width
:
900
,
...
...
@@ -362,7 +362,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => {
scrollbarArrowSize
:
0
,
verticalScrollbarHasArrows
:
false
,
minimap
:
false
,
minimapRender
Text
:
true
,
minimapRender
Characters
:
true
,
pixelRatio
:
1
,
},
new
EditorLayoutInfo
({
width
:
900
,
...
...
@@ -417,7 +417,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => {
scrollbarArrowSize
:
0
,
verticalScrollbarHasArrows
:
false
,
minimap
:
false
,
minimapRender
Text
:
true
,
minimapRender
Characters
:
true
,
pixelRatio
:
1
,
},
new
EditorLayoutInfo
({
width
:
900
,
...
...
@@ -472,7 +472,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => {
scrollbarArrowSize
:
0
,
verticalScrollbarHasArrows
:
false
,
minimap
:
false
,
minimapRender
Text
:
true
,
minimapRender
Characters
:
true
,
pixelRatio
:
1
,
},
new
EditorLayoutInfo
({
width
:
900
,
...
...
@@ -527,7 +527,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => {
scrollbarArrowSize
:
0
,
verticalScrollbarHasArrows
:
false
,
minimap
:
false
,
minimapRender
Text
:
true
,
minimapRender
Characters
:
true
,
pixelRatio
:
1
,
},
new
EditorLayoutInfo
({
width
:
900
,
...
...
@@ -582,7 +582,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => {
scrollbarArrowSize
:
0
,
verticalScrollbarHasArrows
:
false
,
minimap
:
true
,
minimapRender
Text
:
true
,
minimapRender
Characters
:
true
,
pixelRatio
:
1
,
},
new
EditorLayoutInfo
({
width
:
1000
,
...
...
@@ -637,7 +637,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => {
scrollbarArrowSize
:
0
,
verticalScrollbarHasArrows
:
false
,
minimap
:
true
,
minimapRender
Text
:
true
,
minimapRender
Characters
:
true
,
pixelRatio
:
2
,
},
new
EditorLayoutInfo
({
width
:
1000
,
...
...
@@ -692,7 +692,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => {
scrollbarArrowSize
:
0
,
verticalScrollbarHasArrows
:
false
,
minimap
:
true
,
minimapRender
Text
:
true
,
minimapRender
Characters
:
true
,
pixelRatio
:
4
,
},
new
EditorLayoutInfo
({
width
:
1000
,
...
...
src/vs/monaco.d.ts
浏览文件 @
d672ffad
...
...
@@ -1089,7 +1089,7 @@ declare module monaco.editor {
* Render the actual text on a line (as opposed to color blocks).
* Defaults to true.
*/
render
Text
?:
boolean
;
render
Characters
?:
boolean
;
}
/**
...
...
@@ -1503,7 +1503,7 @@ declare module monaco.editor {
export
class
InternalEditorMinimapOptions
{
readonly
_internalEditorMinimapOptionsBrand
:
void
;
readonly
enabled
:
boolean
;
readonly
render
Text
:
boolean
;
readonly
render
Characters
:
boolean
;
}
export
class
EditorWrappingInfo
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录