Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
7ac8e49e
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,发现更多精彩内容 >>
提交
7ac8e49e
编写于
11月 06, 2017
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add additional no unused checks for merge-conflict extension
上级
52f45af7
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
20 addition
and
26 deletion
+20
-26
extensions/merge-conflict/src/codelensProvider.ts
extensions/merge-conflict/src/codelensProvider.ts
+2
-2
extensions/merge-conflict/src/commandHandler.ts
extensions/merge-conflict/src/commandHandler.ts
+8
-8
extensions/merge-conflict/src/contentProvider.ts
extensions/merge-conflict/src/contentProvider.ts
+0
-10
extensions/merge-conflict/src/documentMergeConflict.ts
extensions/merge-conflict/src/documentMergeConflict.ts
+1
-1
extensions/merge-conflict/src/documentTracker.ts
extensions/merge-conflict/src/documentTracker.ts
+1
-1
extensions/merge-conflict/src/mergeConflictParser.ts
extensions/merge-conflict/src/mergeConflictParser.ts
+1
-1
extensions/merge-conflict/src/services.ts
extensions/merge-conflict/src/services.ts
+3
-3
extensions/merge-conflict/tsconfig.json
extensions/merge-conflict/tsconfig.json
+4
-0
未找到文件。
extensions/merge-conflict/src/codelensProvider.ts
浏览文件 @
7ac8e49e
...
...
@@ -13,7 +13,7 @@ export default class MergeConflictCodeLensProvider implements vscode.CodeLensPro
private
config
:
interfaces
.
IExtensionConfiguration
;
private
tracker
:
interfaces
.
IDocumentMergeConflictTracker
;
constructor
(
private
context
:
vscode
.
ExtensionContext
,
trackerService
:
interfaces
.
IDocumentMergeConflictTrackerService
)
{
constructor
(
trackerService
:
interfaces
.
IDocumentMergeConflictTrackerService
)
{
this
.
tracker
=
trackerService
.
createTracker
(
'
codelens
'
);
}
...
...
@@ -46,7 +46,7 @@ export default class MergeConflictCodeLensProvider implements vscode.CodeLensPro
}
}
async
provideCodeLenses
(
document
:
vscode
.
TextDocument
,
token
:
vscode
.
CancellationToken
):
Promise
<
vscode
.
CodeLens
[]
|
null
>
{
async
provideCodeLenses
(
document
:
vscode
.
TextDocument
,
_
token
:
vscode
.
CancellationToken
):
Promise
<
vscode
.
CodeLens
[]
|
null
>
{
if
(
!
this
.
config
||
!
this
.
config
.
enableCodeLens
)
{
return
null
;
...
...
extensions/merge-conflict/src/commandHandler.ts
浏览文件 @
7ac8e49e
...
...
@@ -24,7 +24,7 @@ export default class CommandHandler implements vscode.Disposable {
private
disposables
:
vscode
.
Disposable
[]
=
[];
private
tracker
:
interfaces
.
IDocumentMergeConflictTracker
;
constructor
(
private
context
:
vscode
.
ExtensionContext
,
trackerService
:
interfaces
.
IDocumentMergeConflictTrackerService
)
{
constructor
(
trackerService
:
interfaces
.
IDocumentMergeConflictTrackerService
)
{
this
.
tracker
=
trackerService
.
createTracker
(
'
commands
'
);
}
...
...
@@ -62,19 +62,19 @@ export default class CommandHandler implements vscode.Disposable {
return
this
.
accept
(
interfaces
.
CommitType
.
Both
,
editor
,
...
args
);
}
acceptAllCurrent
(
editor
:
vscode
.
TextEditor
,
...
args
:
any
[]
):
Promise
<
void
>
{
acceptAllCurrent
(
editor
:
vscode
.
TextEditor
):
Promise
<
void
>
{
return
this
.
acceptAll
(
interfaces
.
CommitType
.
Current
,
editor
);
}
acceptAllIncoming
(
editor
:
vscode
.
TextEditor
,
...
args
:
any
[]
):
Promise
<
void
>
{
acceptAllIncoming
(
editor
:
vscode
.
TextEditor
):
Promise
<
void
>
{
return
this
.
acceptAll
(
interfaces
.
CommitType
.
Incoming
,
editor
);
}
acceptAllBoth
(
editor
:
vscode
.
TextEditor
,
...
args
:
any
[]
):
Promise
<
void
>
{
acceptAllBoth
(
editor
:
vscode
.
TextEditor
):
Promise
<
void
>
{
return
this
.
acceptAll
(
interfaces
.
CommitType
.
Both
,
editor
);
}
async
compare
(
editor
:
vscode
.
TextEditor
,
conflict
:
interfaces
.
IDocumentMergeConflict
|
null
,
...
args
:
any
[]
)
{
async
compare
(
editor
:
vscode
.
TextEditor
,
conflict
:
interfaces
.
IDocumentMergeConflict
|
null
)
{
const
fileName
=
path
.
basename
(
editor
.
document
.
uri
.
fsPath
);
// No conflict, command executed from command palette
...
...
@@ -102,15 +102,15 @@ export default class CommandHandler implements vscode.Disposable {
vscode
.
commands
.
executeCommand
(
'
vscode.diff
'
,
leftUri
,
rightUri
,
title
);
}
navigateNext
(
editor
:
vscode
.
TextEditor
,
...
args
:
any
[]
):
Promise
<
void
>
{
navigateNext
(
editor
:
vscode
.
TextEditor
):
Promise
<
void
>
{
return
this
.
navigate
(
editor
,
NavigationDirection
.
Forwards
);
}
navigatePrevious
(
editor
:
vscode
.
TextEditor
,
...
args
:
any
[]
):
Promise
<
void
>
{
navigatePrevious
(
editor
:
vscode
.
TextEditor
):
Promise
<
void
>
{
return
this
.
navigate
(
editor
,
NavigationDirection
.
Backwards
);
}
async
acceptSelection
(
editor
:
vscode
.
TextEditor
,
...
args
:
any
[]
):
Promise
<
void
>
{
async
acceptSelection
(
editor
:
vscode
.
TextEditor
):
Promise
<
void
>
{
let
conflict
=
await
this
.
findConflictContainingSelection
(
editor
);
if
(
!
conflict
)
{
...
...
extensions/merge-conflict/src/contentProvider.ts
浏览文件 @
7ac8e49e
...
...
@@ -4,21 +4,11 @@
*--------------------------------------------------------------------------------------------*/
'
use strict
'
;
import
*
as
vscode
from
'
vscode
'
;
import
*
as
interfaces
from
'
./interfaces
'
;
export
default
class
MergeConflictContentProvider
implements
vscode
.
TextDocumentContentProvider
,
vscode
.
Disposable
{
static
scheme
=
'
merge-conflict.conflict-diff
'
;
constructor
(
private
context
:
vscode
.
ExtensionContext
)
{
}
begin
(
config
:
interfaces
.
IExtensionConfiguration
)
{
this
.
context
.
subscriptions
.
push
(
vscode
.
workspace
.
registerTextDocumentContentProvider
(
MergeConflictContentProvider
.
scheme
,
this
)
);
}
dispose
()
{
}
...
...
extensions/merge-conflict/src/documentMergeConflict.ts
浏览文件 @
7ac8e49e
...
...
@@ -13,7 +13,7 @@ export class DocumentMergeConflict implements interfaces.IDocumentMergeConflict
public
commonAncestors
:
interfaces
.
IMergeRegion
[];
public
splitter
:
vscode
.
Range
;
constructor
(
d
ocument
:
vscode
.
TextDocument
,
d
escriptor
:
interfaces
.
IDocumentMergeConflictDescriptor
)
{
constructor
(
descriptor
:
interfaces
.
IDocumentMergeConflictDescriptor
)
{
this
.
range
=
descriptor
.
range
;
this
.
current
=
descriptor
.
current
;
this
.
incoming
=
descriptor
.
incoming
;
...
...
extensions/merge-conflict/src/documentTracker.ts
浏览文件 @
7ac8e49e
...
...
@@ -116,7 +116,7 @@ export default class DocumentMergeConflictTracker implements vscode.Disposable,
this
.
cache
.
clear
();
}
private
getConflictsOrEmpty
(
document
:
vscode
.
TextDocument
,
origins
:
string
[]):
interfaces
.
IDocumentMergeConflict
[]
{
private
getConflictsOrEmpty
(
document
:
vscode
.
TextDocument
,
_
origins
:
string
[]):
interfaces
.
IDocumentMergeConflict
[]
{
const
containsConflict
=
MergeConflictParser
.
containsConflict
(
document
);
if
(
!
containsConflict
)
{
...
...
extensions/merge-conflict/src/mergeConflictParser.ts
浏览文件 @
7ac8e49e
...
...
@@ -81,7 +81,7 @@ export class MergeConflictParser {
return
conflictDescriptors
.
filter
(
Boolean
)
.
map
(
descriptor
=>
new
DocumentMergeConflict
(
d
ocument
,
d
escriptor
));
.
map
(
descriptor
=>
new
DocumentMergeConflict
(
descriptor
));
}
private
static
scanItemTolMergeConflictDescriptor
(
document
:
vscode
.
TextDocument
,
scanned
:
IScanMergedConflict
):
interfaces
.
IDocumentMergeConflictDescriptor
|
null
{
...
...
extensions/merge-conflict/src/services.ts
浏览文件 @
7ac8e49e
...
...
@@ -26,9 +26,9 @@ export default class ServiceWrapper implements vscode.Disposable {
this
.
services
.
push
(
documentTracker
,
new
CommandHandler
(
this
.
context
,
documentTracker
),
new
CodeLensProvider
(
this
.
context
,
documentTracker
),
new
ContentProvider
(
this
.
context
),
new
CommandHandler
(
documentTracker
),
new
CodeLensProvider
(
documentTracker
),
new
ContentProvider
(),
new
Decorator
(
this
.
context
,
documentTracker
),
);
...
...
extensions/merge-conflict/tsconfig.json
浏览文件 @
7ac8e49e
...
...
@@ -6,6 +6,10 @@
],
"module"
:
"commonjs"
,
"outDir"
:
"./out"
,
"noImplicitAny"
:
true
,
"noImplicitReturns"
:
true
,
"noUnusedLocals"
:
true
,
"noUnusedParameters"
:
true
,
"strict"
:
true
,
"experimentalDecorators"
:
true
},
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录