Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
d5eda850
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,发现更多精彩内容 >>
提交
d5eda850
编写于
6月 26, 2017
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
streamline git ignore
上级
75d4fcbe
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
11 addition
and
30 deletion
+11
-30
extensions/git/src/model.ts
extensions/git/src/model.ts
+11
-30
未找到文件。
extensions/git/src/model.ts
浏览文件 @
d5eda850
...
...
@@ -5,7 +5,7 @@
'
use strict
'
;
import
{
Uri
,
Command
,
EventEmitter
,
Event
,
SourceControlResourceState
,
SourceControlResourceDecorations
,
Disposable
,
ProgressLocation
,
window
,
workspace
,
WorkspaceEdit
,
Position
}
from
'
vscode
'
;
import
{
Uri
,
Command
,
EventEmitter
,
Event
,
SourceControlResourceState
,
SourceControlResourceDecorations
,
Disposable
,
ProgressLocation
,
window
,
workspace
,
WorkspaceEdit
}
from
'
vscode
'
;
import
{
Git
,
Repository
,
Ref
,
Branch
,
Remote
,
Commit
,
GitErrorCodes
}
from
'
./git
'
;
import
{
anyEvent
,
eventToPromise
,
filterEvent
,
EmptyDisposable
,
combinedDisposable
,
dispose
}
from
'
./util
'
;
import
{
memoize
,
throttle
,
debounce
}
from
'
./decorators
'
;
...
...
@@ -18,8 +18,6 @@ const timeout = (millis: number) => new Promise(c => setTimeout(c, millis));
const
localize
=
nls
.
loadMessageBundle
();
const
iconsRootPath
=
path
.
join
(
path
.
dirname
(
__dirname
),
'
resources
'
,
'
icons
'
);
const
ignoreFileName
=
'
.gitignore
'
;
function
getIconUri
(
iconName
:
string
,
theme
:
string
):
Uri
{
return
Uri
.
file
(
path
.
join
(
iconsRootPath
,
theme
,
`
${
iconName
}
.svg`
));
}
...
...
@@ -530,40 +528,23 @@ export class Model implements Disposable {
}
async
ignore
(
files
:
Resource
[]):
Promise
<
void
>
{
const
newLineChar
=
'
\n
'
;
return
await
this
.
run
(
Operation
.
Ignore
,
async
()
=>
{
const
ignoreFile
=
`
${
this
.
repository
.
root
}${
path
.
sep
}${
ignoreFileName
}
`
;
let
textToAppend
=
files
const
ignoreFile
=
`
${
this
.
repository
.
root
}${
path
.
sep
}
.gitignore`
;
const
textToAppend
=
files
.
map
(
file
=>
path
.
relative
(
this
.
repository
.
root
,
file
.
resourceUri
.
fsPath
).
replace
(
/
\\
/g
,
'
/
'
))
.
join
(
newLineChar
);
.
join
(
'
\n
'
);
const
document
=
await
new
Promise
(
c
=>
fs
.
exists
(
ignoreFile
,
c
))
?
await
workspace
.
openTextDocument
(
ignoreFile
)
:
await
workspace
.
openTextDocument
(
Uri
.
file
(
ignoreFile
).
with
({
scheme
:
'
untitled
'
}));
if
(
fs
.
existsSync
(
ignoreFile
))
{
const
edit
=
new
WorkspaceEdit
();
const
ignoreFileToWrite
=
await
workspace
.
openTextDocument
(
ignoreFile
);
//Let's check if that entry exists:
const
gitIgnoreEntries
=
ignoreFileToWrite
.
getText
();
if
(
gitIgnoreEntries
.
indexOf
(
textToAppend
)
===
-
1
)
{
//Entry doesn't exist let's insert this entry:
// Append in new line if there is entries in the file:
textToAppend
=
(
gitIgnoreEntries
.
length
>
0
?
newLineChar
:
''
)
+
textToAppend
;
edit
.
insert
(
ignoreFileToWrite
.
uri
,
ignoreFileToWrite
.
lineAt
(
ignoreFileToWrite
.
lineCount
-
1
).
range
.
end
,
textToAppend
);
workspace
.
applyEdit
(
edit
);
}
}
else
{
await
workspace
.
openTextDocument
(
Uri
.
file
(
ignoreFile
).
with
({
scheme
:
'
untitled
'
})).
then
((
doc
)
=>
{
return
window
.
showTextDocument
(
doc
);
}).
then
((
editor
)
=>
{
await
window
.
showTextDocument
(
document
);
const
edit
=
new
WorkspaceEdit
();
edit
.
insert
(
editor
.
document
.
uri
,
new
Position
(
0
,
0
),
textToAppend
);
edit
.
insert
(
document
.
uri
,
document
.
lineAt
(
document
.
lineCount
-
1
).
range
.
end
,
`
${
textToAppend
}
\n`
);
workspace
.
applyEdit
(
edit
);
});
}
});
}
private
async
run
<
T
>
(
operation
:
Operation
,
runOperation
:
()
=>
Promise
<
T
>
=
()
=>
Promise
.
resolve
<
any
>
(
null
)):
Promise
<
T
>
{
const
run
=
async
()
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录