Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
ad5ffb0b
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,发现更多精彩内容 >>
提交
ad5ffb0b
编写于
10月 22, 2019
作者:
A
Alex Ross
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
https://github.com/Microsoft/vscode
上级
86a9962e
590a0595
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
8 addition
and
4 deletion
+8
-4
.github/workflows/ci.yml
.github/workflows/ci.yml
+3
-0
build/azure-pipelines/darwin/continuous-build-darwin.yml
build/azure-pipelines/darwin/continuous-build-darwin.yml
+1
-1
build/azure-pipelines/linux/continuous-build-linux.yml
build/azure-pipelines/linux/continuous-build-linux.yml
+1
-1
build/azure-pipelines/win32/continuous-build-win32.yml
build/azure-pipelines/win32/continuous-build-win32.yml
+2
-0
src/vs/workbench/services/label/common/labelService.ts
src/vs/workbench/services/label/common/labelService.ts
+1
-2
未找到文件。
.github/workflows/ci.yml
浏览文件 @
ad5ffb0b
...
...
@@ -7,6 +7,7 @@ jobs:
runs-on
:
ubuntu-latest
env
:
CHILD_CONCURRENCY
:
"
1"
GITHUB_TOKEN
:
${{ secrets.GITHUB_TOKEN }}
steps
:
-
uses
:
actions/checkout@v1
# TODO: rename azure-pipelines/linux/xvfb.init to github-actions
...
...
@@ -45,6 +46,7 @@ jobs:
runs-on
:
windows-2016
env
:
CHILD_CONCURRENCY
:
"
1"
GITHUB_TOKEN
:
${{ secrets.GITHUB_TOKEN }}
steps
:
-
uses
:
actions/checkout@v1
-
uses
:
actions/setup-node@v1
...
...
@@ -76,6 +78,7 @@ jobs:
runs-on
:
macos-latest
env
:
CHILD_CONCURRENCY
:
"
1"
GITHUB_TOKEN
:
${{ secrets.GITHUB_TOKEN }}
steps
:
-
uses
:
actions/checkout@v1
-
uses
:
actions/setup-node@v1
...
...
build/azure-pipelines/darwin/continuous-build-darwin.yml
浏览文件 @
ad5ffb0b
...
...
@@ -11,7 +11,7 @@ steps:
inputs
:
versionSpec
:
"
1.x"
-
script
:
|
yarn --frozen-lockfile
CHILD_CONCURRENCY=1
yarn --frozen-lockfile
displayName
:
Install Dependencies
condition
:
and(succeeded(), ne(variables['CacheRestored'], 'true'))
-
task
:
1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
...
...
build/azure-pipelines/linux/continuous-build-linux.yml
浏览文件 @
ad5ffb0b
...
...
@@ -19,7 +19,7 @@ steps:
inputs
:
versionSpec
:
"
1.x"
-
script
:
|
yarn --frozen-lockfile
CHILD_CONCURRENCY=1
yarn --frozen-lockfile
displayName
:
Install Dependencies
condition
:
and(succeeded(), ne(variables['CacheRestored'], 'true'))
-
task
:
1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
...
...
build/azure-pipelines/win32/continuous-build-win32.yml
浏览文件 @
ad5ffb0b
...
...
@@ -16,6 +16,8 @@ steps:
vstsFeed
:
'
$(ArtifactFeed)'
-
powershell
:
|
yarn --frozen-lockfile
env
:
CHILD_CONCURRENCY
:
"
1"
displayName
:
Install Dependencies
condition
:
and(succeeded(), ne(variables['CacheRestored'], 'true'))
-
task
:
1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
...
...
src/vs/workbench/services/label/common/labelService.ts
浏览文件 @
ad5ffb0b
...
...
@@ -13,7 +13,6 @@ import { Registry } from 'vs/platform/registry/common/platform';
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
IWorkspaceContextService
,
IWorkspace
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
isEqual
,
basenameOrAuthority
,
isEqualOrParent
,
basename
,
joinPath
,
dirname
}
from
'
vs/base/common/resources
'
;
import
{
isWindows
}
from
'
vs/base/common/platform
'
;
import
{
tildify
,
getPathLabel
}
from
'
vs/base/common/labels
'
;
import
{
ltrim
,
endsWith
}
from
'
vs/base/common/strings
'
;
import
{
IWorkspaceIdentifier
,
ISingleFolderWorkspaceIdentifier
,
isSingleFolderWorkspaceIdentifier
,
WORKSPACE_EXTENSION
,
toWorkspaceIdentifier
,
isWorkspaceIdentifier
}
from
'
vs/platform/workspaces/common/workspaces
'
;
...
...
@@ -71,7 +70,7 @@ const sepRegexp = /\//g;
const
labelMatchingRegexp
=
/
\$\{(
scheme|authority|path|
(
query
)\.(
.+
?))\}
/g
;
function
hasDriveLetter
(
path
:
string
):
boolean
{
return
!!
(
isWindows
&&
path
&&
path
[
2
]
===
'
:
'
);
return
!!
(
path
&&
path
[
2
]
===
'
:
'
);
}
class
ResourceLabelFormattersHandler
implements
IWorkbenchContribution
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录