Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
392ea6dc
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,发现更多精彩内容 >>
提交
392ea6dc
编写于
9月 24, 2020
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debt - adopt more of the amd.ts helper functions
上级
04a7220e
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
26 addition
and
25 deletion
+26
-25
src/vs/code/electron-main/auth.ts
src/vs/code/electron-main/auth.ts
+2
-2
src/vs/code/electron-main/sharedProcess.ts
src/vs/code/electron-main/sharedProcess.ts
+2
-2
src/vs/code/electron-main/window.ts
src/vs/code/electron-main/window.ts
+2
-5
src/vs/platform/issue/electron-main/issueMainService.ts
src/vs/platform/issue/electron-main/issueMainService.ts
+3
-3
src/vs/workbench/browser/parts/editor/editor.contribution.ts
src/vs/workbench/browser/parts/editor/editor.contribution.ts
+3
-2
src/vs/workbench/browser/parts/editor/editorGroupView.ts
src/vs/workbench/browser/parts/editor/editorGroupView.ts
+2
-1
src/vs/workbench/contrib/debug/browser/debug.contribution.ts
src/vs/workbench/contrib/debug/browser/debug.contribution.ts
+10
-9
src/vs/workbench/services/integrity/node/integrityService.ts
src/vs/workbench/services/integrity/node/integrityService.ts
+2
-1
未找到文件。
src/vs/code/electron-main/auth.ts
浏览文件 @
392ea6dc
...
...
@@ -6,8 +6,8 @@
import
{
localize
}
from
'
vs/nls
'
;
import
{
Disposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
Event
}
from
'
vs/base/common/event
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
{
BrowserWindow
,
BrowserWindowConstructorOptions
,
app
,
AuthInfo
,
WebContents
,
Event
as
ElectronEvent
}
from
'
electron
'
;
import
{
getPathFromAmdModule
}
from
'
vs/base/common/amd
'
;
type
LoginEvent
=
{
event
:
ElectronEvent
;
...
...
@@ -59,7 +59,7 @@ export class ProxyAuthHandler extends Disposable {
show
:
true
,
title
:
'
VS Code
'
,
webPreferences
:
{
preload
:
URI
.
parse
(
require
.
toUrl
(
'
vs/base/parts/sandbox/electron-browser/preload.js
'
)).
fsPath
,
preload
:
getPathFromAmdModule
(
require
,
'
vs/base/parts/sandbox/electron-browser/preload.js
'
)
,
sandbox
:
true
,
contextIsolation
:
true
,
enableWebSQL
:
false
,
...
...
src/vs/code/electron-main/sharedProcess.ts
浏览文件 @
392ea6dc
...
...
@@ -3,7 +3,6 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
{
memoize
}
from
'
vs/base/common/decorators
'
;
import
{
INativeEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
BrowserWindow
,
ipcMain
,
WebContents
,
Event
as
ElectronEvent
}
from
'
electron
'
;
...
...
@@ -14,6 +13,7 @@ import { ILifecycleMainService } from 'vs/platform/lifecycle/electron-main/lifec
import
{
IThemeMainService
}
from
'
vs/platform/theme/electron-main/themeMainService
'
;
import
{
toDisposable
,
DisposableStore
}
from
'
vs/base/common/lifecycle
'
;
import
{
Event
}
from
'
vs/base/common/event
'
;
import
{
getPathFromAmdModule
}
from
'
vs/base/common/amd
'
;
export
class
SharedProcess
implements
ISharedProcess
{
...
...
@@ -41,7 +41,7 @@ export class SharedProcess implements ISharedProcess {
show
:
false
,
backgroundColor
:
this
.
themeMainService
.
getBackgroundColor
(),
webPreferences
:
{
preload
:
URI
.
parse
(
require
.
toUrl
(
'
vs/base/parts/sandbox/electron-browser/preload.js
'
)).
fsPath
,
preload
:
getPathFromAmdModule
(
require
,
'
vs/base/parts/sandbox/electron-browser/preload.js
'
)
,
nodeIntegration
:
true
,
enableWebSQL
:
false
,
enableRemoteModule
:
false
,
...
...
src/vs/code/electron-main/window.ts
浏览文件 @
392ea6dc
...
...
@@ -35,6 +35,7 @@ import { ILifecycleMainService } from 'vs/platform/lifecycle/electron-main/lifec
import
{
IStorageMainService
}
from
'
vs/platform/storage/node/storageMainService
'
;
import
{
IFileService
}
from
'
vs/platform/files/common/files
'
;
import
{
ColorScheme
}
from
'
vs/platform/theme/common/theme
'
;
import
{
getPathFromAmdModule
}
from
'
vs/base/common/amd
'
;
export
interface
IWindowCreationOptions
{
state
:
IWindowState
;
...
...
@@ -166,7 +167,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {
show
:
!
isFullscreenOrMaximized
,
title
:
product
.
nameLong
,
webPreferences
:
{
preload
:
URI
.
parse
(
this
.
doGetPreloadUrl
()).
fsPath
,
preload
:
getPathFromAmdModule
(
require
,
'
vs/base/parts/sandbox/electron-browser/preload.js
'
)
,
enableWebSQL
:
false
,
enableRemoteModule
:
false
,
spellcheck
:
false
,
...
...
@@ -838,10 +839,6 @@ export class CodeWindow extends Disposable implements ICodeWindow {
return
`
${
require
.
toUrl
(
workbench
)}
?config=
${
encodeURIComponent
(
JSON
.
stringify
(
config
))}
`
;
}
private
doGetPreloadUrl
():
string
{
return
require
.
toUrl
(
'
vs/base/parts/sandbox/electron-browser/preload.js
'
);
}
serializeWindowState
():
IWindowState
{
if
(
!
this
.
_win
)
{
return
defaultWindowState
();
...
...
src/vs/platform/issue/electron-main/issueMainService.ts
浏览文件 @
392ea6dc
...
...
@@ -18,7 +18,7 @@ import { ILogService } from 'vs/platform/log/common/log';
import
{
IWindowState
}
from
'
vs/platform/windows/electron-main/windows
'
;
import
{
listProcesses
}
from
'
vs/base/node/ps
'
;
import
{
IDialogMainService
}
from
'
vs/platform/dialogs/electron-main/dialogs
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
{
getPathFromAmdModule
}
from
'
vs/base/common/amd
'
;
import
{
createDecorator
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
zoomLevelToZoomFactor
}
from
'
vs/platform/windows/common/windows
'
;
...
...
@@ -195,7 +195,7 @@ export class IssueMainService implements ICommonIssueService {
title
:
localize
(
'
issueReporter
'
,
"
Issue Reporter
"
),
backgroundColor
:
data
.
styles
.
backgroundColor
||
DEFAULT_BACKGROUND_COLOR
,
webPreferences
:
{
preload
:
URI
.
parse
(
require
.
toUrl
(
'
vs/base/parts/sandbox/electron-browser/preload.js
'
)).
fsPath
,
preload
:
getPathFromAmdModule
(
require
,
'
vs/base/parts/sandbox/electron-browser/preload.js
'
)
,
enableWebSQL
:
false
,
enableRemoteModule
:
false
,
spellcheck
:
false
,
...
...
@@ -261,7 +261,7 @@ export class IssueMainService implements ICommonIssueService {
backgroundColor
:
data
.
styles
.
backgroundColor
,
title
:
localize
(
'
processExplorer
'
,
"
Process Explorer
"
),
webPreferences
:
{
preload
:
URI
.
parse
(
require
.
toUrl
(
'
vs/base/parts/sandbox/electron-browser/preload.js
'
)).
fsPath
,
preload
:
getPathFromAmdModule
(
require
,
'
vs/base/parts/sandbox/electron-browser/preload.js
'
)
,
enableWebSQL
:
false
,
enableRemoteModule
:
false
,
spellcheck
:
false
,
...
...
src/vs/workbench/browser/parts/editor/editor.contribution.ts
浏览文件 @
392ea6dc
...
...
@@ -54,6 +54,7 @@ import { PLAINTEXT_MODE_ID } from 'vs/editor/common/modes/modesRegistry';
import
{
IQuickAccessRegistry
,
Extensions
as
QuickAccessExtensions
}
from
'
vs/platform/quickinput/common/quickAccess
'
;
import
{
ActiveGroupEditorsByMostRecentlyUsedQuickAccess
,
AllEditorsByAppearanceQuickAccess
,
AllEditorsByMostRecentlyUsedQuickAccess
}
from
'
vs/workbench/browser/parts/editor/editorQuickAccess
'
;
import
{
IPathService
}
from
'
vs/workbench/services/path/common/pathService
'
;
import
{
getUriFromAmdModule
}
from
'
vs/base/common/amd
'
;
// Register String Editor
Registry
.
as
<
IEditorRegistry
>
(
EditorExtensions
.
Editors
).
registerEditor
(
...
...
@@ -422,13 +423,13 @@ editorCommands.setup();
// Touch Bar
if
(
isMacintosh
)
{
MenuRegistry
.
appendMenuItem
(
MenuId
.
TouchBarContext
,
{
command
:
{
id
:
NavigateBackwardsAction
.
ID
,
title
:
NavigateBackwardsAction
.
LABEL
,
icon
:
{
dark
:
URI
.
parse
(
require
.
toUrl
(
'
vs/workbench/browser/parts/editor/media/back-tb.png
'
)
)
}
},
command
:
{
id
:
NavigateBackwardsAction
.
ID
,
title
:
NavigateBackwardsAction
.
LABEL
,
icon
:
{
dark
:
getUriFromAmdModule
(
require
,
'
vs/workbench/browser/parts/editor/media/back-tb.png
'
)
}
},
group
:
'
navigation
'
,
order
:
0
});
MenuRegistry
.
appendMenuItem
(
MenuId
.
TouchBarContext
,
{
command
:
{
id
:
NavigateForwardAction
.
ID
,
title
:
NavigateForwardAction
.
LABEL
,
icon
:
{
dark
:
URI
.
parse
(
require
.
toUrl
(
'
vs/workbench/browser/parts/editor/media/forward-tb.png
'
)
)
}
},
command
:
{
id
:
NavigateForwardAction
.
ID
,
title
:
NavigateForwardAction
.
LABEL
,
icon
:
{
dark
:
getUriFromAmdModule
(
require
,
'
vs/workbench/browser/parts/editor/media/forward-tb.png
'
)
}
},
group
:
'
navigation
'
,
order
:
1
});
...
...
src/vs/workbench/browser/parts/editor/editorGroupView.ts
浏览文件 @
392ea6dc
...
...
@@ -52,6 +52,7 @@ import { IDialogService, IFileDialogService, ConfirmResult } from 'vs/platform/d
import
{
ILogService
}
from
'
vs/platform/log/common/log
'
;
import
{
Codicon
}
from
'
vs/base/common/codicons
'
;
import
{
IFilesConfigurationService
,
AutoSaveMode
}
from
'
vs/workbench/services/filesConfiguration/common/filesConfigurationService
'
;
import
{
getPathFromAmdModule
}
from
'
vs/base/common/amd
'
;
export
class
EditorGroupView
extends
Themable
implements
IEditorGroupView
{
...
...
@@ -1780,7 +1781,7 @@ registerThemingParticipant((theme, collector, environment) => {
const
letterpress
=
`./media/letterpress
${
theme
.
type
===
'
dark
'
?
'
-dark
'
:
theme
.
type
===
'
hc
'
?
'
-hc
'
:
''
}
.svg`
;
collector
.
addRule
(
`
.monaco-workbench .part.editor > .content .editor-group-container.empty .editor-group-letterpress {
background-image: url('
${
require
.
toUrl
(
letterpress
)}
')
background-image: url('
${
getPathFromAmdModule
(
require
,
letterpress
)}
')
}
`
);
...
...
src/vs/workbench/contrib/debug/browser/debug.contribution.ts
浏览文件 @
392ea6dc
...
...
@@ -52,6 +52,7 @@ import { DebugTitleContribution } from 'vs/workbench/contrib/debug/browser/debug
import
{
Codicon
}
from
'
vs/base/common/codicons
'
;
import
{
registerColors
}
from
'
vs/workbench/contrib/debug/browser/debugColors
'
;
import
{
DebugEditorContribution
}
from
'
vs/workbench/contrib/debug/browser/debugEditorContribution
'
;
import
{
getUriFromAmdModule
}
from
'
vs/base/common/amd
'
;
const
registry
=
Registry
.
as
<
IWorkbenchActionRegistry
>
(
WorkbenchActionRegistryExtensions
.
WorkbenchActions
);
const
debugCategory
=
nls
.
localize
(
'
debugCategory
'
,
"
Debug
"
);
...
...
@@ -209,15 +210,15 @@ function registerCommandsAndActions(): void {
});
};
registerTouchBarEntry
(
StartAction
.
ID
,
StartAction
.
LABEL
,
0
,
CONTEXT_IN_DEBUG_MODE
.
toNegated
(),
URI
.
parse
(
require
.
toUrl
(
'
vs/workbench/contrib/debug/browser/media/continue-tb.png
'
)
));
registerTouchBarEntry
(
RunAction
.
ID
,
RunAction
.
LABEL
,
1
,
CONTEXT_IN_DEBUG_MODE
.
toNegated
(),
URI
.
parse
(
require
.
toUrl
(
'
vs/workbench/contrib/debug/browser/media/continue-without-debugging-tb.png
'
)
));
registerTouchBarEntry
(
CONTINUE_ID
,
CONTINUE_LABEL
,
0
,
CONTEXT_DEBUG_STATE
.
isEqualTo
(
'
stopped
'
),
URI
.
parse
(
require
.
toUrl
(
'
vs/workbench/contrib/debug/browser/media/continue-tb.png
'
)
));
registerTouchBarEntry
(
PAUSE_ID
,
PAUSE_LABEL
,
1
,
ContextKeyExpr
.
and
(
CONTEXT_IN_DEBUG_MODE
,
ContextKeyExpr
.
notEquals
(
'
debugState
'
,
'
stopped
'
)),
URI
.
parse
(
require
.
toUrl
(
'
vs/workbench/contrib/debug/browser/media/pause-tb.png
'
)
));
registerTouchBarEntry
(
STEP_OVER_ID
,
STEP_OVER_LABEL
,
2
,
CONTEXT_IN_DEBUG_MODE
,
URI
.
parse
(
require
.
toUrl
(
'
vs/workbench/contrib/debug/browser/media/stepover-tb.png
'
)
));
registerTouchBarEntry
(
STEP_INTO_ID
,
STEP_INTO_LABEL
,
3
,
CONTEXT_IN_DEBUG_MODE
,
URI
.
parse
(
require
.
toUrl
(
'
vs/workbench/contrib/debug/browser/media/stepinto-tb.png
'
)
));
registerTouchBarEntry
(
STEP_OUT_ID
,
STEP_OUT_LABEL
,
4
,
CONTEXT_IN_DEBUG_MODE
,
URI
.
parse
(
require
.
toUrl
(
'
vs/workbench/contrib/debug/browser/media/stepout-tb.png
'
)
));
registerTouchBarEntry
(
RESTART_SESSION_ID
,
RESTART_LABEL
,
5
,
CONTEXT_IN_DEBUG_MODE
,
URI
.
parse
(
require
.
toUrl
(
'
vs/workbench/contrib/debug/browser/media/restart-tb.png
'
)
));
registerTouchBarEntry
(
STOP_ID
,
STOP_LABEL
,
6
,
CONTEXT_IN_DEBUG_MODE
,
URI
.
parse
(
require
.
toUrl
(
'
vs/workbench/contrib/debug/browser/media/stop-tb.png
'
)
));
registerTouchBarEntry
(
StartAction
.
ID
,
StartAction
.
LABEL
,
0
,
CONTEXT_IN_DEBUG_MODE
.
toNegated
(),
getUriFromAmdModule
(
require
,
'
vs/workbench/contrib/debug/browser/media/continue-tb.png
'
));
registerTouchBarEntry
(
RunAction
.
ID
,
RunAction
.
LABEL
,
1
,
CONTEXT_IN_DEBUG_MODE
.
toNegated
(),
getUriFromAmdModule
(
require
,
'
vs/workbench/contrib/debug/browser/media/continue-without-debugging-tb.png
'
));
registerTouchBarEntry
(
CONTINUE_ID
,
CONTINUE_LABEL
,
0
,
CONTEXT_DEBUG_STATE
.
isEqualTo
(
'
stopped
'
),
getUriFromAmdModule
(
require
,
'
vs/workbench/contrib/debug/browser/media/continue-tb.png
'
));
registerTouchBarEntry
(
PAUSE_ID
,
PAUSE_LABEL
,
1
,
ContextKeyExpr
.
and
(
CONTEXT_IN_DEBUG_MODE
,
ContextKeyExpr
.
notEquals
(
'
debugState
'
,
'
stopped
'
)),
getUriFromAmdModule
(
require
,
'
vs/workbench/contrib/debug/browser/media/pause-tb.png
'
));
registerTouchBarEntry
(
STEP_OVER_ID
,
STEP_OVER_LABEL
,
2
,
CONTEXT_IN_DEBUG_MODE
,
getUriFromAmdModule
(
require
,
'
vs/workbench/contrib/debug/browser/media/stepover-tb.png
'
));
registerTouchBarEntry
(
STEP_INTO_ID
,
STEP_INTO_LABEL
,
3
,
CONTEXT_IN_DEBUG_MODE
,
getUriFromAmdModule
(
require
,
'
vs/workbench/contrib/debug/browser/media/stepinto-tb.png
'
));
registerTouchBarEntry
(
STEP_OUT_ID
,
STEP_OUT_LABEL
,
4
,
CONTEXT_IN_DEBUG_MODE
,
getUriFromAmdModule
(
require
,
'
vs/workbench/contrib/debug/browser/media/stepout-tb.png
'
));
registerTouchBarEntry
(
RESTART_SESSION_ID
,
RESTART_LABEL
,
5
,
CONTEXT_IN_DEBUG_MODE
,
getUriFromAmdModule
(
require
,
'
vs/workbench/contrib/debug/browser/media/restart-tb.png
'
));
registerTouchBarEntry
(
STOP_ID
,
STOP_LABEL
,
6
,
CONTEXT_IN_DEBUG_MODE
,
getUriFromAmdModule
(
require
,
'
vs/workbench/contrib/debug/browser/media/stop-tb.png
'
));
}
}
...
...
src/vs/workbench/services/integrity/node/integrityService.ts
浏览文件 @
392ea6dc
...
...
@@ -15,6 +15,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
import
{
IStorageService
,
StorageScope
}
from
'
vs/platform/storage/common/storage
'
;
import
{
registerSingleton
}
from
'
vs/platform/instantiation/common/extensions
'
;
import
{
IOpenerService
}
from
'
vs/platform/opener/common/opener
'
;
import
{
getUriFromAmdModule
}
from
'
vs/base/common/amd
'
;
interface
IStorageData
{
dontShowPrompt
:
boolean
;
...
...
@@ -141,7 +142,7 @@ export class IntegrityServiceImpl implements IIntegrityService {
}
private
_resolve
(
filename
:
string
,
expected
:
string
):
Promise
<
ChecksumPair
>
{
let
fileUri
=
URI
.
parse
(
require
.
toUrl
(
filename
)
);
const
fileUri
=
getUriFromAmdModule
(
require
,
filename
);
return
new
Promise
<
ChecksumPair
>
((
resolve
,
reject
)
=>
{
fs
.
readFile
(
fileUri
.
fsPath
,
(
err
,
buff
)
=>
{
if
(
err
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录