Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
2e14de43
R
roslyn
项目概览
lwm1986
/
roslyn
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
roslyn
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2e14de43
编写于
7月 15, 2020
作者:
S
Sam Harwell
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename GetService to avoid confusion
上级
0535a472
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
10 addition
and
9 deletion
+10
-9
src/VisualStudio/Core/Def/Implementation/Experimentation/KeybindingResetDetector.cs
...Implementation/Experimentation/KeybindingResetDetector.cs
+5
-5
src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs
...Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs
+2
-2
src/VisualStudio/Core/Def/Utilities/IServiceProviderExtensions.cs
...alStudio/Core/Def/Utilities/IServiceProviderExtensions.cs
+3
-2
未找到文件。
src/VisualStudio/Core/Def/Implementation/Experimentation/KeybindingResetDetector.cs
浏览文件 @
2e14de43
...
...
@@ -114,7 +114,7 @@ private void InitializeCore()
return
;
}
var
vsShell
=
_serviceProvider
.
GetService
<
IVsShell
,
SVsShell
>();
var
vsShell
=
_serviceProvider
.
GetService
TheWrongWay
<
IVsShell
,
SVsShell
>();
var
hr
=
vsShell
.
IsPackageInstalled
(
ReSharperPackageGuid
,
out
var
extensionEnabled
);
if
(
ErrorHandler
.
Failed
(
hr
))
{
...
...
@@ -127,7 +127,7 @@ private void InitializeCore()
if
(
_resharperExtensionInstalledAndEnabled
)
{
// We need to monitor for suspend/resume commands, so create and install the command target and the modal callback.
var
priorityCommandTargetRegistrar
=
_serviceProvider
.
GetService
<
IVsRegisterPriorityCommandTarget
,
SVsRegisterPriorityCommandTarget
>();
var
priorityCommandTargetRegistrar
=
_serviceProvider
.
GetService
TheWrongWay
<
IVsRegisterPriorityCommandTarget
,
SVsRegisterPriorityCommandTarget
>();
hr
=
priorityCommandTargetRegistrar
.
RegisterPriorityCommandTarget
(
dwReserved
:
0
/* from docs must be 0 */
,
pCmdTrgt
:
this
,
...
...
@@ -335,7 +335,7 @@ async Task EnsureOleCommandTargetAsync()
await
ThreadingContext
.
JoinableTaskFactory
.
SwitchToMainThreadAsync
(
cancellationToken
);
_oleCommandTarget
=
_serviceProvider
.
GetService
<
IOleCommandTarget
,
SUIHostCommandDispatcher
>();
_oleCommandTarget
=
_serviceProvider
.
GetService
TheWrongWay
<
IOleCommandTarget
,
SUIHostCommandDispatcher
>();
}
}
...
...
@@ -345,7 +345,7 @@ private void RestoreVsKeybindings()
if
(
_uiShell
==
null
)
{
_uiShell
=
_serviceProvider
.
GetService
<
IVsUIShell
,
SVsUIShell
>();
_uiShell
=
_serviceProvider
.
GetService
TheWrongWay
<
IVsUIShell
,
SVsUIShell
>();
}
ErrorHandler
.
ThrowOnFailure
(
_uiShell
.
PostExecCommand
(
...
...
@@ -432,7 +432,7 @@ private async Task ShutdownAsync()
if
(
_priorityCommandTargetCookie
!=
VSConstants
.
VSCOOKIE_NIL
)
{
var
priorityCommandTargetRegistrar
=
_serviceProvider
.
GetService
<
IVsRegisterPriorityCommandTarget
,
SVsRegisterPriorityCommandTarget
>();
var
priorityCommandTargetRegistrar
=
_serviceProvider
.
GetService
TheWrongWay
<
IVsRegisterPriorityCommandTarget
,
SVsRegisterPriorityCommandTarget
>();
var
cookie
=
_priorityCommandTargetCookie
;
_priorityCommandTargetCookie
=
VSConstants
.
VSCOOKIE_NIL
;
var
hr
=
priorityCommandTargetRegistrar
.
UnregisterPriorityCommandTarget
(
cookie
);
...
...
src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs
浏览文件 @
2e14de43
...
...
@@ -1033,7 +1033,7 @@ private bool TryGetFrame(CodeAnalysis.TextDocument document, [NotNullWhen(return
// document using its ItemId. Thus, we must use OpenDocumentViaProject, which only
// depends on the file path.
var
openDocumentService
=
ServiceProvider
.
GlobalProvider
.
GetService
<
IVsUIShellOpenDocument
,
SVsUIShellOpenDocument
>();
var
openDocumentService
=
ServiceProvider
.
GlobalProvider
.
GetService
TheWrongWay
<
IVsUIShellOpenDocument
,
SVsUIShellOpenDocument
>();
return
ErrorHandler
.
Succeeded
(
openDocumentService
.
OpenDocumentViaProject
(
document
.
FilePath
,
VSConstants
.
LOGVIEWID
.
TextView_guid
,
...
...
@@ -1072,7 +1072,7 @@ public void CloseDocumentCore(DocumentId documentId)
var
filePath
=
this
.
GetFilePath
(
documentId
);
if
(
filePath
!=
null
)
{
var
openDocumentService
=
ServiceProvider
.
GlobalProvider
.
GetService
<
IVsUIShellOpenDocument
,
SVsUIShellOpenDocument
>();
var
openDocumentService
=
ServiceProvider
.
GlobalProvider
.
GetService
TheWrongWay
<
IVsUIShellOpenDocument
,
SVsUIShellOpenDocument
>();
if
(
ErrorHandler
.
Succeeded
(
openDocumentService
.
IsDocumentOpen
(
null
,
0
,
filePath
,
Guid
.
Empty
,
0
,
out
var
uiHierarchy
,
null
,
out
var
frame
,
out
var
isOpen
)))
{
// TODO: do we need save argument for CloseDocument?
...
...
src/VisualStudio/Core/Def/Utilities/IServiceProviderExtensions.cs
浏览文件 @
2e14de43
...
...
@@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information.
using
System
;
using
System.Diagnostics
;
namespace
Microsoft.VisualStudio.LanguageServices.Utilities
{
...
...
@@ -11,7 +12,7 @@ internal static class IServiceProviderExtensions
/// <summary>
/// Returns the specified interface from the service. This is useful when the service and interface differ
/// </summary>
public
static
TInterfaceType
GetService
<
TInterfaceType
,
TServiceType
>(
this
IServiceProvider
sp
)
public
static
TInterfaceType
GetService
TheWrongWay
<
TInterfaceType
,
TServiceType
>(
this
IServiceProvider
sp
)
where
TInterfaceType
:
class
where
TServiceType
:
class
{
...
...
@@ -22,6 +23,6 @@ internal static class IServiceProviderExtensions
/// Returns the specified service type from the service.
/// </summary>
public
static
TServiceType
GetService
<
TServiceType
>(
this
IServiceProvider
sp
)
where
TServiceType
:
class
=>
sp
.
GetService
<
TServiceType
,
TServiceType
>();
=>
sp
.
GetService
TheWrongWay
<
TServiceType
,
TServiceType
>();
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录