Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
4e25d355
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,发现更多精彩内容 >>
提交
4e25d355
编写于
6月 19, 2017
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #28886: Layer breaker in vs/platform/statusbar/common/statusbar.ts
上级
6f3ef708
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
22 addition
and
17 deletion
+22
-17
build/monaco/monaco.d.ts.recipe
build/monaco/monaco.d.ts.recipe
+1
-0
src/vs/editor/browser/services/codeEditorServiceImpl.ts
src/vs/editor/browser/services/codeEditorServiceImpl.ts
+2
-2
src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.ts
...owser/viewParts/overviewRuler/decorationsOverviewRuler.ts
+2
-1
src/vs/editor/common/editorCommon.ts
src/vs/editor/common/editorCommon.ts
+1
-4
src/vs/editor/common/model/textModelWithDecorations.ts
src/vs/editor/common/model/textModelWithDecorations.ts
+4
-3
src/vs/monaco.d.ts
src/vs/monaco.d.ts
+4
-4
src/vs/platform/statusbar/common/statusbar.ts
src/vs/platform/statusbar/common/statusbar.ts
+1
-1
src/vs/platform/theme/common/themeService.ts
src/vs/platform/theme/common/themeService.ts
+4
-0
src/vs/workbench/api/electron-browser/mainThreadStatusBar.ts
src/vs/workbench/api/electron-browser/mainThreadStatusBar.ts
+1
-1
src/vs/workbench/api/node/extHost.protocol.ts
src/vs/workbench/api/node/extHost.protocol.ts
+2
-1
未找到文件。
build/monaco/monaco.d.ts.recipe
浏览文件 @
4e25d355
...
...
@@ -70,6 +70,7 @@ export interface ICommandHandler {
#include(vs/platform/markers/common/markers): IMarkerData
#include(vs/editor/browser/standalone/colorizer): IColorizerOptions, IColorizerElementOptions
#include(vs/base/common/scrollable): ScrollbarVisibility
#include(vs/platform/theme/common/themeService): ThemeColor
#includeAll(vs/editor/common/editorCommon;IMode=>languages.IMode;LanguageIdentifier=>languages.LanguageIdentifier;editorOptions.=>): ISelection, IScrollEvent
#includeAll(vs/editor/common/model/textModelEvents):
#includeAll(vs/editor/common/controller/cursorEvents):
...
...
src/vs/editor/browser/services/codeEditorServiceImpl.ts
浏览文件 @
4e25d355
...
...
@@ -9,11 +9,11 @@ import URI from 'vs/base/common/uri';
import
*
as
dom
from
'
vs/base/browser/dom
'
;
import
{
IDecorationRenderOptions
,
IModelDecorationOptions
,
IModelDecorationOverviewRulerOptions
,
IThemeDecorationRenderOptions
,
IContentDecorationRenderOptions
,
OverviewRulerLane
,
TrackedRangeStickiness
,
ThemeColor
,
isThemeColor
IContentDecorationRenderOptions
,
OverviewRulerLane
,
TrackedRangeStickiness
,
isThemeColor
}
from
'
vs/editor/common/editorCommon
'
;
import
{
AbstractCodeEditorService
}
from
'
vs/editor/common/services/abstractCodeEditorService
'
;
import
{
IDisposable
,
dispose
as
disposeAll
}
from
'
vs/base/common/lifecycle
'
;
import
{
IThemeService
,
ITheme
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
IThemeService
,
ITheme
,
ThemeColor
}
from
'
vs/platform/theme/common/themeService
'
;
export
class
CodeEditorServiceImpl
extends
AbstractCodeEditorService
{
...
...
src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.ts
浏览文件 @
4e25d355
...
...
@@ -16,6 +16,7 @@ import * as viewEvents from 'vs/editor/common/view/viewEvents';
import
{
OverviewRulerZone
}
from
'
vs/editor/common/view/overviewZoneManager
'
;
import
{
editorOverviewRulerBorder
,
editorCursor
}
from
'
vs/editor/common/view/editorColorRegistry
'
;
import
{
Color
}
from
'
vs/base/common/color
'
;
import
{
ThemeColor
}
from
"
vs/platform/theme/common/themeService
"
;
export
class
DecorationsOverviewRuler
extends
ViewPart
{
...
...
@@ -191,7 +192,7 @@ export class DecorationsOverviewRuler extends ViewPart {
return
zones
;
}
private
resolveRulerColor
(
color
:
string
|
editorCommon
.
ThemeColor
):
string
{
private
resolveRulerColor
(
color
:
string
|
ThemeColor
):
string
{
if
(
editorCommon
.
isThemeColor
(
color
))
{
let
c
=
this
.
_context
.
theme
.
getColor
(
color
.
id
)
||
Color
.
transparent
;
return
c
.
toString
();
...
...
src/vs/editor/common/editorCommon.ts
浏览文件 @
4e25d355
...
...
@@ -24,6 +24,7 @@ import {
import
*
as
editorOptions
from
'
vs/editor/common/config/editorOptions
'
;
import
{
ICursorPositionChangedEvent
,
ICursorSelectionChangedEvent
}
from
'
vs/editor/common/controller/cursorEvents
'
;
import
{
ICursors
,
CursorConfiguration
}
from
'
vs/editor/common/controller/cursorCommon
'
;
import
{
ThemeColor
}
from
"
vs/platform/theme/common/themeService
"
;
/**
* Vertical Lane in the overview ruler of the editor.
...
...
@@ -1622,10 +1623,6 @@ export interface IEditorContribution {
restoreViewState
?(
state
:
any
):
void
;
}
export
interface
ThemeColor
{
id
:
string
;
}
/**
* @internal
*/
...
...
src/vs/editor/common/model/textModelWithDecorations.ts
浏览文件 @
4e25d355
...
...
@@ -16,6 +16,7 @@ import { INewMarker, TextModelWithMarkers } from 'vs/editor/common/model/textMod
import
{
LanguageIdentifier
}
from
'
vs/editor/common/modes
'
;
import
{
ITextSource
,
IRawTextSource
}
from
'
vs/editor/common/model/textSource
'
;
import
*
as
textModelEvents
from
'
vs/editor/common/model/textModelEvents
'
;
import
{
ThemeColor
}
from
"
vs/platform/theme/common/themeService
"
;
export
const
ClassName
=
{
EditorWarningDecoration
:
'
greensquiggly
'
,
...
...
@@ -840,9 +841,9 @@ function cleanClassName(className: string): string {
}
export
class
ModelDecorationOverviewRulerOptions
implements
editorCommon
.
IModelDecorationOverviewRulerOptions
{
readonly
color
:
string
|
editorCommon
.
ThemeColor
;
readonly
darkColor
:
string
|
editorCommon
.
ThemeColor
;
readonly
hcColor
:
string
|
editorCommon
.
ThemeColor
;
readonly
color
:
string
|
ThemeColor
;
readonly
darkColor
:
string
|
ThemeColor
;
readonly
hcColor
:
string
|
ThemeColor
;
readonly
position
:
editorCommon
.
OverviewRulerLane
;
constructor
(
options
:
editorCommon
.
IModelDecorationOverviewRulerOptions
)
{
...
...
src/vs/monaco.d.ts
浏览文件 @
4e25d355
...
...
@@ -1052,6 +1052,10 @@ declare module monaco.editor {
Visible
=
3
,
}
export
interface
ThemeColor
{
id
:
string
;
}
/**
* Vertical Lane in the overview ruler of the editor.
*/
...
...
@@ -2159,10 +2163,6 @@ declare module monaco.editor {
restoreViewState
?(
state
:
any
):
void
;
}
export
interface
ThemeColor
{
id
:
string
;
}
export
interface
ICommonCodeEditor
extends
IEditor
{
/**
* An event emitted when the content of the current model has changed.
...
...
src/vs/platform/statusbar/common/statusbar.ts
浏览文件 @
4e25d355
...
...
@@ -7,7 +7,7 @@
import
{
createDecorator
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
IDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
ThemeColor
}
from
'
vs/editor/common/editorCommon
'
;
import
{
ThemeColor
}
from
"
vs/platform/theme/common/themeService
"
;
export
var
IStatusbarService
=
createDecorator
<
IStatusbarService
>
(
'
statusbarService
'
);
...
...
src/vs/platform/theme/common/themeService.ts
浏览文件 @
4e25d355
...
...
@@ -13,6 +13,10 @@ import Event, { Emitter } from 'vs/base/common/event';
export
let
IThemeService
=
createDecorator
<
IThemeService
>
(
'
themeService
'
);
export
interface
ThemeColor
{
id
:
string
;
}
// base themes
export
const
DARK
:
ThemeType
=
'
dark
'
;
export
const
LIGHT
:
ThemeType
=
'
light
'
;
...
...
src/vs/workbench/api/electron-browser/mainThreadStatusBar.ts
浏览文件 @
4e25d355
...
...
@@ -7,7 +7,7 @@
import
{
IStatusbarService
,
StatusbarAlignment
as
MainThreadStatusBarAlignment
}
from
'
vs/platform/statusbar/common/statusbar
'
;
import
{
IDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
MainThreadStatusBarShape
}
from
'
../node/extHost.protocol
'
;
import
{
ThemeColor
}
from
'
vs/editor/common/editorCommon
'
;
import
{
ThemeColor
}
from
"
vs/platform/theme/common/themeService
"
;
export
class
MainThreadStatusBar
extends
MainThreadStatusBarShape
{
private
mapIdToDisposable
:
{
[
id
:
number
]:
IDisposable
};
...
...
src/vs/workbench/api/node/extHost.protocol.ts
浏览文件 @
4e25d355
...
...
@@ -45,6 +45,7 @@ import { IRange } from 'vs/editor/common/core/range';
import
{
ISelection
,
Selection
}
from
'
vs/editor/common/core/selection
'
;
import
{
ITreeItem
}
from
'
vs/workbench/parts/views/common/views
'
;
import
{
ThemeColor
}
from
"
vs/platform/theme/common/themeService
"
;
export
interface
IEnvironment
{
enableProposedApiForAll
:
boolean
;
...
...
@@ -274,7 +275,7 @@ export abstract class MainThreadQuickOpenShape {
}
export
abstract
class
MainThreadStatusBarShape
{
$setEntry
(
id
:
number
,
extensionId
:
string
,
text
:
string
,
tooltip
:
string
,
command
:
string
,
color
:
string
|
editorCommon
.
ThemeColor
,
alignment
:
MainThreadStatusBarAlignment
,
priority
:
number
):
void
{
throw
ni
();
}
$setEntry
(
id
:
number
,
extensionId
:
string
,
text
:
string
,
tooltip
:
string
,
command
:
string
,
color
:
string
|
ThemeColor
,
alignment
:
MainThreadStatusBarAlignment
,
priority
:
number
):
void
{
throw
ni
();
}
$dispose
(
id
:
number
)
{
throw
ni
();
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录