Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
d5a55ef7
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,发现更多精彩内容 >>
提交
d5a55ef7
编写于
4月 06, 2020
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #83215
上级
404f66c1
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
21 addition
and
25 deletion
+21
-25
src/vs/platform/environment/common/environment.ts
src/vs/platform/environment/common/environment.ts
+1
-2
src/vs/platform/extensionManagement/common/extensionGalleryService.ts
...orm/extensionManagement/common/extensionGalleryService.ts
+1
-3
src/vs/platform/serviceMachineId/common/serviceMachineId.ts
src/vs/platform/serviceMachineId/common/serviceMachineId.ts
+15
-17
src/vs/platform/userDataSync/common/userDataSyncStoreService.ts
.../platform/userDataSync/common/userDataSyncStoreService.ts
+1
-3
src/vs/workbench/services/environment/browser/environmentService.ts
...kbench/services/environment/browser/environmentService.ts
+3
-0
未找到文件。
src/vs/platform/environment/common/environment.ts
浏览文件 @
d5a55ef7
...
@@ -63,8 +63,7 @@ export interface IEnvironmentService {
...
@@ -63,8 +63,7 @@ export interface IEnvironmentService {
// --- misc
// --- misc
disableTelemetry
:
boolean
;
disableTelemetry
:
boolean
;
// TODO@sandeep move into node layer (https://github.com/microsoft/vscode/issues/94504)
serviceMachineIdResource
:
URI
;
serviceMachineIdResource
?:
URI
;
/**
/**
* @deprecated use IRemotePathService#userHome instead (https://github.com/microsoft/vscode/issues/94506)
* @deprecated use IRemotePathService#userHome instead (https://github.com/microsoft/vscode/issues/94506)
...
...
src/vs/platform/extensionManagement/common/extensionGalleryService.ts
浏览文件 @
d5a55ef7
...
@@ -769,8 +769,6 @@ export async function resolveMarketplaceHeaders(version: string, environmentServ
...
@@ -769,8 +769,6 @@ export async function resolveMarketplaceHeaders(version: string, environmentServ
'
User-Agent
'
:
`VSCode
${
version
}
`
'
User-Agent
'
:
`VSCode
${
version
}
`
};
};
const
uuid
=
await
getServiceMachineId
(
environmentService
,
fileService
,
storageService
);
const
uuid
=
await
getServiceMachineId
(
environmentService
,
fileService
,
storageService
);
if
(
uuid
)
{
headers
[
'
X-Market-User-Id
'
]
=
uuid
;
headers
[
'
X-Market-User-Id
'
]
=
uuid
;
}
return
headers
;
return
headers
;
}
}
src/vs/platform/serviceMachineId/common/serviceMachineId.ts
浏览文件 @
d5a55ef7
...
@@ -12,12 +12,11 @@ import { VSBuffer } from 'vs/base/common/buffer';
...
@@ -12,12 +12,11 @@ import { VSBuffer } from 'vs/base/common/buffer';
export
async
function
getServiceMachineId
(
environmentService
:
IEnvironmentService
,
fileService
:
IFileService
,
storageService
:
{
export
async
function
getServiceMachineId
(
environmentService
:
IEnvironmentService
,
fileService
:
IFileService
,
storageService
:
{
get
:
(
key
:
string
,
scope
:
StorageScope
,
fallbackValue
?:
string
|
undefined
)
=>
string
|
undefined
,
get
:
(
key
:
string
,
scope
:
StorageScope
,
fallbackValue
?:
string
|
undefined
)
=>
string
|
undefined
,
store
:
(
key
:
string
,
value
:
string
,
scope
:
StorageScope
)
=>
void
store
:
(
key
:
string
,
value
:
string
,
scope
:
StorageScope
)
=>
void
}
|
undefined
):
Promise
<
string
|
null
>
{
}
|
undefined
):
Promise
<
string
>
{
let
uuid
:
string
|
null
=
storageService
?
storageService
.
get
(
'
storage.serviceMachineId
'
,
StorageScope
.
GLOBAL
)
||
null
:
null
;
let
uuid
:
string
|
null
=
storageService
?
storageService
.
get
(
'
storage.serviceMachineId
'
,
StorageScope
.
GLOBAL
)
||
null
:
null
;
if
(
uuid
)
{
if
(
uuid
)
{
return
uuid
;
return
uuid
;
}
}
if
(
environmentService
.
serviceMachineIdResource
)
{
try
{
try
{
const
contents
=
await
fileService
.
readFile
(
environmentService
.
serviceMachineIdResource
);
const
contents
=
await
fileService
.
readFile
(
environmentService
.
serviceMachineIdResource
);
const
value
=
contents
.
value
.
toString
();
const
value
=
contents
.
value
.
toString
();
...
@@ -34,8 +33,7 @@ export async function getServiceMachineId(environmentService: IEnvironmentServic
...
@@ -34,8 +33,7 @@ export async function getServiceMachineId(environmentService: IEnvironmentServic
//noop
//noop
}
}
}
}
}
if
(
storageService
)
{
if
(
uuid
&&
storageService
)
{
storageService
.
store
(
'
storage.serviceMachineId
'
,
uuid
,
StorageScope
.
GLOBAL
);
storageService
.
store
(
'
storage.serviceMachineId
'
,
uuid
,
StorageScope
.
GLOBAL
);
}
}
return
uuid
;
return
uuid
;
...
...
src/vs/platform/userDataSync/common/userDataSyncStoreService.ts
浏览文件 @
d5a55ef7
...
@@ -43,9 +43,7 @@ export class UserDataSyncStoreService extends Disposable implements IUserDataSyn
...
@@ -43,9 +43,7 @@ export class UserDataSyncStoreService extends Disposable implements IUserDataSyn
const
headers
:
IHeaders
=
{
const
headers
:
IHeaders
=
{
'
X-Sync-Client-Id
'
:
productService
.
version
,
'
X-Sync-Client-Id
'
:
productService
.
version
,
};
};
if
(
uuid
)
{
headers
[
'
X-Sync-Machine-Id
'
]
=
uuid
;
headers
[
'
X-Sync-Machine-Id
'
]
=
uuid
;
}
return
headers
;
return
headers
;
});
});
}
}
...
...
src/vs/workbench/services/environment/browser/environmentService.ts
浏览文件 @
d5a55ef7
...
@@ -134,6 +134,9 @@ export class BrowserWorkbenchEnvironmentService implements IWorkbenchEnvironment
...
@@ -134,6 +134,9 @@ export class BrowserWorkbenchEnvironmentService implements IWorkbenchEnvironment
@
memoize
@
memoize
get
untitledWorkspacesHome
():
URI
{
return
joinPath
(
this
.
userRoamingDataHome
,
'
Workspaces
'
);
}
get
untitledWorkspacesHome
():
URI
{
return
joinPath
(
this
.
userRoamingDataHome
,
'
Workspaces
'
);
}
@
memoize
get
serviceMachineIdResource
():
URI
{
return
joinPath
(
this
.
userRoamingDataHome
,
'
machineid
'
);
}
private
_extensionHostDebugEnvironment
:
IExtensionHostDebugEnvironment
|
undefined
=
undefined
;
private
_extensionHostDebugEnvironment
:
IExtensionHostDebugEnvironment
|
undefined
=
undefined
;
get
debugExtensionHost
():
IExtensionHostDebugParams
{
get
debugExtensionHost
():
IExtensionHostDebugParams
{
if
(
!
this
.
_extensionHostDebugEnvironment
)
{
if
(
!
this
.
_extensionHostDebugEnvironment
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录