Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
镜像
Coder
code-server
提交
96fe3c27
C
code-server
项目概览
镜像
/
Coder
/
code-server
2022-09-21 03:15:05同步失败
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
code-server
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
96fe3c27
编写于
5月 01, 2021
作者:
A
Akash Satheesan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(lib/vscode): conflicts in productService.ts
上级
532ae145
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
3 addition
and
160 deletion
+3
-160
lib/vscode/src/vs/base/common/product.ts
lib/vscode/src/vs/base/common/product.ts
+3
-0
lib/vscode/src/vs/platform/product/common/productService.ts
lib/vscode/src/vs/platform/product/common/productService.ts
+0
-160
未找到文件。
lib/vscode/src/vs/base/common/product.ts
浏览文件 @
96fe3c27
...
@@ -26,6 +26,9 @@ export type ExtensionUntrustedWorkspaceSupport = {
...
@@ -26,6 +26,9 @@ export type ExtensionUntrustedWorkspaceSupport = {
};
};
export
interface
IProductConfiguration
{
export
interface
IProductConfiguration
{
// NOTE@coder: add codeServerVersion
readonly
codeServerVersion
?:
string
;
readonly
version
:
string
;
readonly
version
:
string
;
readonly
date
?:
string
;
readonly
date
?:
string
;
readonly
quality
?:
string
;
readonly
quality
?:
string
;
...
...
lib/vscode/src/vs/platform/product/common/productService.ts
浏览文件 @
96fe3c27
...
@@ -13,163 +13,3 @@ export interface IProductService extends Readonly<IProductConfiguration> {
...
@@ -13,163 +13,3 @@ export interface IProductService extends Readonly<IProductConfiguration> {
readonly
_serviceBrand
:
undefined
;
readonly
_serviceBrand
:
undefined
;
}
}
<<<<<<<
HEAD
export
interface
IBuiltInExtension
{
readonly
name
:
string
;
readonly
version
:
string
;
readonly
repo
:
string
;
readonly
metadata
:
any
;
}
export
type
ConfigurationSyncStore
=
{
url
:
string
,
insidersUrl
:
string
,
stableUrl
:
string
,
canSwitch
:
boolean
,
authenticationProviders
:
IStringDictionary
<
{
scopes
:
string
[]
}
>
};
export
interface
IProductConfiguration
{
readonly
codeServerVersion
?:
string
;
readonly
version
:
string
;
readonly
date
?:
string
;
readonly
quality
?:
string
;
readonly
commit
?:
string
;
readonly
nameShort
:
string
;
readonly
nameLong
:
string
;
readonly
win32AppUserModelId
?:
string
;
readonly
win32MutexName
?:
string
;
readonly
applicationName
:
string
;
readonly
urlProtocol
:
string
;
readonly
dataFolderName
:
string
;
// location for extensions (e.g. ~/.vscode-insiders)
readonly
builtInExtensions
?:
IBuiltInExtension
[];
readonly
downloadUrl
?:
string
;
readonly
updateUrl
?:
string
;
readonly
webEndpointUrl
?:
string
;
readonly
target
?:
string
;
readonly
settingsSearchBuildId
?:
number
;
readonly
settingsSearchUrl
?:
string
;
readonly
tasConfig
?:
{
endpoint
:
string
;
telemetryEventName
:
string
;
featuresTelemetryPropertyName
:
string
;
assignmentContextTelemetryPropertyName
:
string
;
};
readonly
experimentsUrl
?:
string
;
readonly
extensionsGallery
?:
{
readonly
serviceUrl
:
string
;
readonly
itemUrl
:
string
;
readonly
controlUrl
:
string
;
readonly
recommendationsUrl
:
string
;
};
readonly
extensionTips
?:
{
[
id
:
string
]:
string
;
};
readonly
extensionImportantTips
?:
IStringDictionary
<
ImportantExtensionTip
>
;
readonly
configBasedExtensionTips
?:
{
[
id
:
string
]:
IConfigBasedExtensionTip
;
};
readonly
exeBasedExtensionTips
?:
{
[
id
:
string
]:
IExeBasedExtensionTip
;
};
readonly
remoteExtensionTips
?:
{
[
remoteName
:
string
]:
IRemoteExtensionTip
;
};
readonly
extensionKeywords
?:
{
[
extension
:
string
]:
readonly
string
[];
};
readonly
keymapExtensionTips
?:
readonly
string
[];
readonly
trustedExtensionUrlPublicKeys
?:
{
[
id
:
string
]:
string
[];
};
readonly
crashReporter
?:
{
readonly
companyName
:
string
;
readonly
productName
:
string
;
};
readonly
enableTelemetry
?:
boolean
;
readonly
aiConfig
?:
{
readonly
asimovKey
:
string
;
};
readonly
sendASmile
?:
{
readonly
reportIssueUrl
:
string
,
readonly
requestFeatureUrl
:
string
};
readonly
documentationUrl
?:
string
;
readonly
releaseNotesUrl
?:
string
;
readonly
keyboardShortcutsUrlMac
?:
string
;
readonly
keyboardShortcutsUrlLinux
?:
string
;
readonly
keyboardShortcutsUrlWin
?:
string
;
readonly
introductoryVideosUrl
?:
string
;
readonly
tipsAndTricksUrl
?:
string
;
readonly
newsletterSignupUrl
?:
string
;
readonly
twitterUrl
?:
string
;
readonly
requestFeatureUrl
?:
string
;
readonly
reportIssueUrl
?:
string
;
readonly
reportMarketplaceIssueUrl
?:
string
;
readonly
licenseUrl
?:
string
;
readonly
privacyStatementUrl
?:
string
;
readonly
telemetryOptOutUrl
?:
string
;
readonly
npsSurveyUrl
?:
string
;
readonly
cesSurveyUrl
?:
string
;
readonly
surveys
?:
readonly
ISurveyData
[];
readonly
checksums
?:
{
[
path
:
string
]:
string
;
};
readonly
checksumFailMoreInfoUrl
?:
string
;
readonly
appCenter
?:
IAppCenterConfiguration
;
readonly
portable
?:
string
;
readonly
extensionKind
?:
{
readonly
[
extensionId
:
string
]:
ExtensionKind
[];
};
readonly
extensionSyncedKeys
?:
{
readonly
[
extensionId
:
string
]:
string
[];
};
readonly
extensionAllowedProposedApi
?:
readonly
string
[];
readonly
msftInternalDomains
?:
string
[];
readonly
linkProtectionTrustedDomains
?:
readonly
string
[];
readonly
'
configurationSync.store
'
?:
ConfigurationSyncStore
;
readonly
darwinUniversalAssetId
?:
string
;
}
export
type
ImportantExtensionTip
=
{
name
:
string
;
languages
?:
string
[];
pattern
?:
string
;
isExtensionPack
?:
boolean
};
export
interface
IAppCenterConfiguration
{
readonly
'
win32-ia32
'
:
string
;
readonly
'
win32-x64
'
:
string
;
readonly
'
linux-x64
'
:
string
;
readonly
'
darwin
'
:
string
;
}
export
interface
IConfigBasedExtensionTip
{
configPath
:
string
;
configName
:
string
;
recommendations
:
IStringDictionary
<
{
name
:
string
,
remotes
?:
string
[],
important
?:
boolean
,
isExtensionPack
?:
boolean
}
>
;
}
export
interface
IExeBasedExtensionTip
{
friendlyName
:
string
;
windowsPath
?:
string
;
important
?:
boolean
;
recommendations
:
IStringDictionary
<
{
name
:
string
,
important
?:
boolean
,
isExtensionPack
?:
boolean
}
>
;
}
export
interface
IRemoteExtensionTip
{
friendlyName
:
string
;
extensionId
:
string
;
}
export
interface
ISurveyData
{
surveyId
:
string
;
surveyUrl
:
string
;
languageId
:
string
;
editCount
:
number
;
userProbability
:
number
;
}
=======
>>>>>>>
58
ce849223667f77dc0d6d7658870ca3f815e17f
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录