Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
c08cfdf1
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,发现更多精彩内容 >>
提交
c08cfdf1
编写于
8月 13, 2019
作者:
R
Rachel Macfarlane
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move cleanRemoteAuthority function to common location
上级
5d49ab27
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
18 addition
and
31 deletion
+18
-31
src/vs/platform/telemetry/browser/workbenchCommonProperties.ts
...s/platform/telemetry/browser/workbenchCommonProperties.ts
+1
-15
src/vs/platform/telemetry/common/telemetryUtils.ts
src/vs/platform/telemetry/common/telemetryUtils.ts
+16
-0
src/vs/platform/telemetry/node/workbenchCommonProperties.ts
src/vs/platform/telemetry/node/workbenchCommonProperties.ts
+1
-16
未找到文件。
src/vs/platform/telemetry/browser/workbenchCommonProperties.ts
浏览文件 @
c08cfdf1
...
...
@@ -12,6 +12,7 @@ export const lastSessionDateStorageKey = 'telemetry.lastSessionDate';
import
*
as
Platform
from
'
vs/base/common/platform
'
;
import
*
as
uuid
from
'
vs/base/common/uuid
'
;
import
{
cleanRemoteAuthority
}
from
'
vs/platform/telemetry/common/telemetryUtils
'
;
export
async
function
resolveWorkbenchCommonProperties
(
storageService
:
IStorageService
,
commit
:
string
|
undefined
,
version
:
string
|
undefined
,
machineId
:
string
,
remoteAuthority
?:
string
):
Promise
<
{
[
name
:
string
]:
string
|
undefined
}
>
{
const
result
:
{
[
name
:
string
]:
string
|
undefined
;
}
=
Object
.
create
(
null
);
...
...
@@ -69,18 +70,3 @@ export async function resolveWorkbenchCommonProperties(storageService: IStorageS
return
result
;
}
function
cleanRemoteAuthority
(
remoteAuthority
?:
string
):
string
{
if
(
!
remoteAuthority
)
{
return
'
none
'
;
}
let
ret
=
'
other
'
;
// Whitelisted remote authorities
[
'
ssh-remote
'
,
'
dev-container
'
,
'
attached-container
'
,
'
wsl
'
].
forEach
((
res
:
string
)
=>
{
if
(
remoteAuthority
!
.
indexOf
(
`
${
res
}
+`
)
===
0
)
{
ret
=
res
;
}
});
return
ret
;
}
src/vs/platform/telemetry/common/telemetryUtils.ts
浏览文件 @
c08cfdf1
...
...
@@ -288,6 +288,22 @@ export function validateTelemetryData(data?: any): { properties: Properties, mea
};
}
export
function
cleanRemoteAuthority
(
remoteAuthority
?:
string
):
string
{
if
(
!
remoteAuthority
)
{
return
'
none
'
;
}
let
ret
=
'
other
'
;
// Whitelisted remote authorities
[
'
ssh-remote
'
,
'
dev-container
'
,
'
attached-container
'
,
'
wsl
'
].
forEach
((
res
:
string
)
=>
{
if
(
remoteAuthority
!
.
indexOf
(
`
${
res
}
+`
)
===
0
)
{
ret
=
res
;
}
});
return
ret
;
}
function
flatten
(
obj
:
any
,
result
:
{
[
key
:
string
]:
any
},
order
:
number
=
0
,
prefix
?:
string
):
void
{
if
(
!
obj
)
{
return
;
...
...
src/vs/platform/telemetry/node/workbenchCommonProperties.ts
浏览文件 @
c08cfdf1
...
...
@@ -6,6 +6,7 @@
import
{
IStorageService
,
StorageScope
}
from
'
vs/platform/storage/common/storage
'
;
import
{
resolveCommonProperties
}
from
'
vs/platform/telemetry/node/commonProperties
'
;
import
{
instanceStorageKey
,
firstSessionDateStorageKey
,
lastSessionDateStorageKey
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
cleanRemoteAuthority
}
from
'
vs/platform/telemetry/common/telemetryUtils
'
;
export
async
function
resolveWorkbenchCommonProperties
(
storageService
:
IStorageService
,
commit
:
string
|
undefined
,
version
:
string
|
undefined
,
machineId
:
string
,
installSourcePath
:
string
,
remoteAuthority
?:
string
):
Promise
<
{
[
name
:
string
]:
string
|
undefined
}
>
{
const
result
=
await
resolveCommonProperties
(
commit
,
version
,
machineId
,
installSourcePath
);
...
...
@@ -30,19 +31,3 @@ export async function resolveWorkbenchCommonProperties(storageService: IStorageS
return
result
;
}
function
cleanRemoteAuthority
(
remoteAuthority
?:
string
):
string
{
if
(
!
remoteAuthority
)
{
return
'
none
'
;
}
let
ret
=
'
other
'
;
// Whitelisted remote authorities
[
'
ssh-remote
'
,
'
dev-container
'
,
'
wsl
'
].
forEach
((
res
:
string
)
=>
{
if
(
remoteAuthority
!
.
indexOf
(
`
${
res
}
+`
)
===
0
)
{
ret
=
res
;
}
});
return
ret
;
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录