Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
238db1cb
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,发现更多精彩内容 >>
提交
238db1cb
编写于
12月 12, 2017
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'jayjun-commit-counter'
上级
80281fde
946d872a
变更
9
显示空白变更内容
内联
并排
Showing
9 changed file
with
99 addition
and
6 deletion
+99
-6
extensions/git/src/repository.ts
extensions/git/src/repository.ts
+1
-0
src/vs/vscode.d.ts
src/vs/vscode.d.ts
+5
-0
src/vs/workbench/api/electron-browser/mainThreadSCM.ts
src/vs/workbench/api/electron-browser/mainThreadSCM.ts
+10
-0
src/vs/workbench/api/node/extHost.protocol.ts
src/vs/workbench/api/node/extHost.protocol.ts
+1
-0
src/vs/workbench/api/node/extHostSCM.ts
src/vs/workbench/api/node/extHostSCM.ts
+12
-1
src/vs/workbench/parts/scm/electron-browser/scm.contribution.ts
.../workbench/parts/scm/electron-browser/scm.contribution.ts
+6
-0
src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
+59
-4
src/vs/workbench/services/scm/common/scm.ts
src/vs/workbench/services/scm/common/scm.ts
+2
-0
src/vs/workbench/services/scm/common/scmService.ts
src/vs/workbench/services/scm/common/scmService.ts
+3
-1
未找到文件。
extensions/git/src/repository.ts
浏览文件 @
238db1cb
...
...
@@ -519,6 +519,7 @@ export class Repository implements Disposable {
this
.
_sourceControl
.
inputBox
.
placeholder
=
localize
(
'
commitMessage
'
,
"
Message (press {0} to commit)
"
);
this
.
_sourceControl
.
acceptInputCommand
=
{
command
:
'
git.commitWithInput
'
,
title
:
localize
(
'
commit
'
,
"
Commit
"
),
arguments
:
[
this
.
_sourceControl
]
};
this
.
_sourceControl
.
quickDiffProvider
=
this
;
this
.
_sourceControl
.
inputBox
.
lineWarningLength
=
72
;
this
.
disposables
.
push
(
this
.
_sourceControl
);
this
.
_mergeGroup
=
this
.
_sourceControl
.
createResourceGroup
(
'
merge
'
,
localize
(
'
merge changes
'
,
"
Merge Changes
"
));
...
...
src/vs/vscode.d.ts
浏览文件 @
238db1cb
...
...
@@ -5782,6 +5782,11 @@ declare module 'vscode' {
* A string to show as place holder in the input box to guide the user.
*/
placeholder
:
string
;
/**
* The warning threshold for lines in the input box.
*/
lineWarningLength
:
number
|
undefined
;
}
interface
QuickDiffProvider
{
...
...
src/vs/workbench/api/electron-browser/mainThreadSCM.ts
浏览文件 @
238db1cb
...
...
@@ -391,4 +391,14 @@ export class MainThreadSCM implements MainThreadSCMShape {
repository
.
input
.
placeholder
=
placeholder
;
}
$setLineWarningLength
(
sourceControlHandle
:
number
,
lineWarningLength
:
number
):
void
{
const
repository
=
this
.
_repositories
[
sourceControlHandle
];
if
(
!
repository
)
{
return
;
}
repository
.
input
.
lineWarningLength
=
lineWarningLength
;
}
}
src/vs/workbench/api/node/extHost.protocol.ts
浏览文件 @
238db1cb
...
...
@@ -410,6 +410,7 @@ export interface MainThreadSCMShape extends IDisposable {
$setInputBoxValue
(
sourceControlHandle
:
number
,
value
:
string
):
void
;
$setInputBoxPlaceholder
(
sourceControlHandle
:
number
,
placeholder
:
string
):
void
;
$setLineWarningLength
(
sourceControlHandle
:
number
,
lineWarningLength
:
number
):
void
;
}
export
type
DebugSessionUUID
=
string
;
...
...
src/vs/workbench/api/node/extHostSCM.ts
浏览文件 @
238db1cb
...
...
@@ -110,7 +110,7 @@ function compareResourceStates(a: vscode.SourceControlResourceState, b: vscode.S
return
result
;
}
export
class
ExtHostSCMInputBox
{
export
class
ExtHostSCMInputBox
implements
vscode
.
SourceControlInputBox
{
private
_value
:
string
=
''
;
...
...
@@ -140,6 +140,17 @@ export class ExtHostSCMInputBox {
this
.
_placeholder
=
placeholder
;
}
private
_lineWarningLength
:
number
|
undefined
;
get
lineWarningLength
():
number
|
undefined
{
return
this
.
_lineWarningLength
;
}
set
lineWarningLength
(
lineWarningLength
:
number
)
{
this
.
_proxy
.
$setLineWarningLength
(
this
.
_sourceControlHandle
,
lineWarningLength
);
this
.
_lineWarningLength
=
lineWarningLength
;
}
constructor
(
private
_proxy
:
MainThreadSCMShape
,
private
_sourceControlHandle
:
number
)
{
// noop
}
...
...
src/vs/workbench/parts/scm/electron-browser/scm.contribution.ts
浏览文件 @
238db1cb
...
...
@@ -74,5 +74,11 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).regis
default
:
'
all
'
,
description
:
localize
(
'
diffDecorations
'
,
"
Controls diff decorations in the editor.
"
)
},
'
scm.inputCounter
'
:
{
type
:
'
string
'
,
enum
:
[
'
always
'
,
'
warn
'
,
'
off
'
],
default
:
'
warn
'
,
description
:
localize
(
'
inputCounter
'
,
"
Controls when to display the input counter.
"
)
}
}
});
\ No newline at end of file
src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
浏览文件 @
238db1cb
...
...
@@ -8,7 +8,7 @@
import
'
vs/css!./media/scmViewlet
'
;
import
{
localize
}
from
'
vs/nls
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
Event
,
{
Emitter
,
chain
,
mapEvent
}
from
'
vs/base/common/event
'
;
import
Event
,
{
Emitter
,
chain
,
mapEvent
,
anyEvent
}
from
'
vs/base/common/event
'
;
import
{
domEvent
,
stop
}
from
'
vs/base/browser/event
'
;
import
{
basename
}
from
'
vs/base/common/paths
'
;
import
{
onUnexpectedError
}
from
'
vs/base/common/errors
'
;
...
...
@@ -45,7 +45,7 @@ import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace
import
{
IStorageService
}
from
'
vs/platform/storage/common/storage
'
;
import
{
IViewletService
}
from
'
vs/workbench/services/viewlet/browser/viewlet
'
;
import
{
IExtensionsViewlet
,
VIEWLET_ID
as
EXTENSIONS_VIEWLET_ID
}
from
'
vs/workbench/parts/extensions/common/extensions
'
;
import
{
I
nputBox
}
from
'
vs/base/browser/ui/inputbox/inputBox
'
;
import
{
I
Message
,
InputBox
,
MessageType
}
from
'
vs/base/browser/ui/inputbox/inputBox
'
;
import
{
StandardKeyboardEvent
}
from
'
vs/base/browser/keyboardEvent
'
;
import
{
KeyMod
,
KeyCode
}
from
'
vs/base/common/keyCodes
'
;
import
{
Command
}
from
'
vs/editor/common/modes
'
;
...
...
@@ -56,6 +56,7 @@ import { format } from 'vs/base/common/strings';
import
{
ISpliceable
,
ISequence
,
ISplice
}
from
'
vs/base/common/sequence
'
;
import
{
firstIndex
}
from
'
vs/base/common/arrays
'
;
import
{
WorkbenchList
,
IListService
}
from
'
vs/platform/list/browser/listService
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
// TODO@Joao
// Need to subclass MenuItemActionItem in order to respect
...
...
@@ -695,7 +696,8 @@ export class RepositoryPanel extends ViewletPanel {
@
IWorkbenchEditorService
protected
editorService
:
IWorkbenchEditorService
,
@
IEditorGroupService
protected
editorGroupService
:
IEditorGroupService
,
@
IContextKeyService
protected
contextKeyService
:
IContextKeyService
,
@
IInstantiationService
protected
instantiationService
:
IInstantiationService
@
IInstantiationService
protected
instantiationService
:
IInstantiationService
,
@
IConfigurationService
protected
configurationService
:
IConfigurationService
)
{
super
(
repository
.
provider
.
label
,
{},
keybindingService
,
contextMenuService
);
this
.
menus
=
instantiationService
.
createInstance
(
SCMMenus
,
repository
.
provider
);
...
...
@@ -753,10 +755,63 @@ export class RepositoryPanel extends ViewletPanel {
this
.
inputBox
.
setPlaceHolder
(
placeholder
);
};
this
.
inputBox
=
new
InputBox
(
this
.
inputBoxContainer
,
this
.
contextViewService
,
{
flexibleHeight
:
true
});
const
validation
=
(
text
:
string
):
IMessage
=>
{
const
setting
=
this
.
configurationService
.
getValue
<
'
always
'
|
'
warn
'
|
'
off
'
>
(
'
scm.inputCounter
'
);
if
(
setting
===
'
off
'
)
{
return
null
;
}
let
position
=
this
.
inputBox
.
inputElement
.
selectionStart
;
let
start
=
0
,
end
;
let
match
:
RegExpExecArray
;
const
regex
=
/
\r?\n
/g
;
while
((
match
=
regex
.
exec
(
text
))
&&
position
>
match
.
index
)
{
start
=
match
.
index
+
match
[
0
].
length
;
}
end
=
match
?
match
.
index
:
text
.
length
;
const
line
=
text
.
substring
(
start
,
end
);
const
lineWarningLength
=
this
.
repository
.
input
.
lineWarningLength
;
if
(
lineWarningLength
===
undefined
)
{
return
{
content
:
localize
(
'
commitMessageInfo
'
,
"
{0} characters in current line
"
,
text
.
length
),
type
:
MessageType
.
INFO
};
}
if
(
line
.
length
<=
lineWarningLength
)
{
if
(
setting
!==
'
always
'
)
{
return
null
;
}
return
{
content
:
localize
(
'
commitMessageCountdown
'
,
"
{0} characters left in current line
"
,
lineWarningLength
-
line
.
length
),
type
:
MessageType
.
INFO
};
}
else
{
return
{
content
:
localize
(
'
commitMessageWarning
'
,
"
{0} characters over {1} in current line
"
,
line
.
length
-
lineWarningLength
,
lineWarningLength
),
type
:
MessageType
.
WARNING
};
}
};
this
.
inputBox
=
new
InputBox
(
this
.
inputBoxContainer
,
this
.
contextViewService
,
{
flexibleHeight
:
true
,
validationOptions
:
{
validation
:
validation
}
});
this
.
disposables
.
push
(
attachInputBoxStyler
(
this
.
inputBox
,
this
.
themeService
));
this
.
disposables
.
push
(
this
.
inputBox
);
const
onKeyUp
=
domEvent
(
this
.
inputBox
.
inputElement
,
'
keyup
'
);
const
onMouseUp
=
domEvent
(
this
.
inputBox
.
inputElement
,
'
mouseup
'
);
anyEvent
<
any
>
(
onKeyUp
,
onMouseUp
)(()
=>
this
.
inputBox
.
validate
(),
null
,
this
.
disposables
);
this
.
inputBox
.
value
=
this
.
repository
.
input
.
value
;
this
.
inputBox
.
onDidChange
(
value
=>
this
.
repository
.
input
.
value
=
value
,
null
,
this
.
disposables
);
this
.
repository
.
input
.
onDidChange
(
value
=>
this
.
inputBox
.
value
=
value
,
null
,
this
.
disposables
);
...
...
src/vs/workbench/services/scm/common/scm.ts
浏览文件 @
238db1cb
...
...
@@ -74,6 +74,8 @@ export interface ISCMInput {
placeholder
:
string
;
readonly
onDidChangePlaceholder
:
Event
<
string
>
;
lineWarningLength
:
number
|
undefined
;
}
export
interface
ISCMRepository
extends
IDisposable
{
...
...
src/vs/workbench/services/scm/common/scmService.ts
浏览文件 @
238db1cb
...
...
@@ -39,6 +39,8 @@ class SCMInput implements ISCMInput {
private
_onDidChangePlaceholder
=
new
Emitter
<
string
>
();
get
onDidChangePlaceholder
():
Event
<
string
>
{
return
this
.
_onDidChangePlaceholder
.
event
;
}
public
lineWarningLength
:
number
|
undefined
=
undefined
;
}
class
SCMRepository
implements
ISCMRepository
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录