Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
818b0a72
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,发现更多精彩内容 >>
提交
818b0a72
编写于
6月 29, 2017
作者:
K
Kevin Pilch
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert public API changes
上级
8de15ee5
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
34 addition
and
15 deletion
+34
-15
src/EditorFeatures/Core/Shared/Preview/PreviewWorkspace.cs
src/EditorFeatures/Core/Shared/Preview/PreviewWorkspace.cs
+6
-1
src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs
...Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs
+6
-1
src/Workspaces/Core/Portable/PublicAPI.Shipped.txt
src/Workspaces/Core/Portable/PublicAPI.Shipped.txt
+3
-0
src/Workspaces/Core/Portable/PublicAPI.Unshipped.txt
src/Workspaces/Core/Portable/PublicAPI.Unshipped.txt
+3
-9
src/Workspaces/Core/Portable/Workspace/AdhocWorkspace.cs
src/Workspaces/Core/Portable/Workspace/AdhocWorkspace.cs
+3
-1
src/Workspaces/Core/Portable/Workspace/Workspace_Editor.cs
src/Workspaces/Core/Portable/Workspace/Workspace_Editor.cs
+10
-2
src/Workspaces/Remote/Core/Services/RemoteWorkspace.cs
src/Workspaces/Remote/Core/Services/RemoteWorkspace.cs
+3
-1
未找到文件。
src/EditorFeatures/Core/Shared/Preview/PreviewWorkspace.cs
浏览文件 @
818b0a72
...
...
@@ -60,7 +60,12 @@ public override void OpenDocument(DocumentId documentId, bool activate = true)
this
.
OnDocumentOpened
(
documentId
,
text
.
Container
);
}
public
override
void
OpenAdditionalDocument
(
DocumentId
documentId
)
/// <summary>
/// Puts the specified additional document into the open state.
/// </summary>
/// <param name="documentId">The <see cref="DocumentId"/> to open.</param>
/// <param name="activate">Ignored - not necessary for additional documents.</param>
public
override
void
OpenAdditionalDocument
(
DocumentId
documentId
,
bool
activate
=
true
)
{
var
document
=
this
.
CurrentSolution
.
GetAdditionalDocument
(
documentId
);
var
text
=
document
.
GetTextAsync
(
CancellationToken
.
None
).
WaitAndGetResult
(
CancellationToken
.
None
);
...
...
src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs
浏览文件 @
818b0a72
...
...
@@ -753,7 +753,12 @@ public override void OpenDocument(DocumentId documentId, bool activate = true)
OpenDocumentCore
(
documentId
,
activate
);
}
public
override
void
OpenAdditionalDocument
(
DocumentId
documentId
)
/// <summary>
/// Puts the specified additional document into the open state.
/// </summary>
/// <param name="documentId">The <see cref="DocumentId"/> to open.</param>
/// <param name="activate">Ignored - not necessary for additional documents.</param>
public
override
void
OpenAdditionalDocument
(
DocumentId
documentId
,
bool
activate
=
true
)
{
OpenDocumentCore
(
documentId
);
}
...
...
src/Workspaces/Core/Portable/PublicAPI.Shipped.txt
浏览文件 @
818b0a72
...
...
@@ -1075,6 +1075,7 @@ Microsoft.CodeAnalysis.Workspace.DocumentOpened -> System.EventHandler<Microsoft
Microsoft.CodeAnalysis.Workspace.Kind.get -> string
Microsoft.CodeAnalysis.Workspace.OnAdditionalDocumentAdded(Microsoft.CodeAnalysis.DocumentInfo documentInfo) -> void
Microsoft.CodeAnalysis.Workspace.OnAdditionalDocumentClosed(Microsoft.CodeAnalysis.DocumentId documentId, Microsoft.CodeAnalysis.TextLoader reloader) -> void
Microsoft.CodeAnalysis.Workspace.OnAdditionalDocumentOpened(Microsoft.CodeAnalysis.DocumentId documentId, Microsoft.CodeAnalysis.Text.SourceTextContainer textContainer, bool isCurrentContext = true) -> void
Microsoft.CodeAnalysis.Workspace.OnAdditionalDocumentRemoved(Microsoft.CodeAnalysis.DocumentId documentId) -> void
Microsoft.CodeAnalysis.Workspace.OnAdditionalDocumentTextChanged(Microsoft.CodeAnalysis.DocumentId documentId, Microsoft.CodeAnalysis.Text.SourceText newText, Microsoft.CodeAnalysis.PreservationMode mode) -> void
Microsoft.CodeAnalysis.Workspace.OnAdditionalDocumentTextLoaderChanged(Microsoft.CodeAnalysis.DocumentId documentId, Microsoft.CodeAnalysis.TextLoader loader) -> void
...
...
@@ -1164,6 +1165,7 @@ override Microsoft.CodeAnalysis.AdhocWorkspace.CanApplyChange(Microsoft.CodeAnal
override Microsoft.CodeAnalysis.AdhocWorkspace.CanOpenDocuments.get -> bool
override Microsoft.CodeAnalysis.AdhocWorkspace.CloseAdditionalDocument(Microsoft.CodeAnalysis.DocumentId documentId) -> void
override Microsoft.CodeAnalysis.AdhocWorkspace.CloseDocument(Microsoft.CodeAnalysis.DocumentId documentId) -> void
override Microsoft.CodeAnalysis.AdhocWorkspace.OpenAdditionalDocument(Microsoft.CodeAnalysis.DocumentId documentId, bool activate = true) -> void
override Microsoft.CodeAnalysis.AdhocWorkspace.OpenDocument(Microsoft.CodeAnalysis.DocumentId documentId, bool activate = true) -> void
override Microsoft.CodeAnalysis.Classification.ClassifiedSpan.Equals(object obj) -> bool
override Microsoft.CodeAnalysis.Classification.ClassifiedSpan.GetHashCode() -> int
...
...
@@ -1461,6 +1463,7 @@ virtual Microsoft.CodeAnalysis.Workspace.OnDocumentTextChanged(Microsoft.CodeAna
virtual Microsoft.CodeAnalysis.Workspace.OnProjectReloaded(Microsoft.CodeAnalysis.ProjectInfo reloadedProjectInfo) -> void
virtual Microsoft.CodeAnalysis.Workspace.OnProjectRemoved(Microsoft.CodeAnalysis.ProjectId projectId) -> void
virtual Microsoft.CodeAnalysis.Workspace.OnWorkspaceFailed(Microsoft.CodeAnalysis.WorkspaceDiagnostic diagnostic) -> void
virtual Microsoft.CodeAnalysis.Workspace.OpenAdditionalDocument(Microsoft.CodeAnalysis.DocumentId documentId, bool activate = true) -> void
virtual Microsoft.CodeAnalysis.Workspace.OpenDocument(Microsoft.CodeAnalysis.DocumentId documentId, bool activate = true) -> void
virtual Microsoft.CodeAnalysis.Workspace.PartialSemanticsEnabled.get -> bool
virtual Microsoft.CodeAnalysis.Workspace.TryApplyChanges(Microsoft.CodeAnalysis.Solution newSolution) -> bool
src/Workspaces/Core/Portable/PublicAPI.Unshipped.txt
浏览文件 @
818b0a72
abstract Microsoft.CodeAnalysis.Editing.SyntaxGenerator.AddEventHandler(Microsoft.CodeAnalysis.SyntaxNode event, Microsoft.CodeAnalysis.SyntaxNode handler) -> Microsoft.CodeAnalysis.SyntaxNode
abstract Microsoft.CodeAnalysis.Editing.SyntaxGenerator.LockStatement(Microsoft.CodeAnalysis.SyntaxNode expression, System.Collections.Generic.IEnumerable<Microsoft.CodeAnalysis.SyntaxNode> statements) -> Microsoft.CodeAnalysis.SyntaxNode
abstract Microsoft.CodeAnalysis.Editing.SyntaxGenerator.RemoveEventHandler(Microsoft.CodeAnalysis.SyntaxNode event, Microsoft.CodeAnalysis.SyntaxNode handler) -> Microsoft.CodeAnalysis.SyntaxNode
Microsoft.CodeAnalysis.ApplyChangesKind.ChangeDocumentInfo = 16 -> Microsoft.CodeAnalysis.ApplyChangesKind
Microsoft.CodeAnalysis.Document.WithFilePath(string filePath) -> Microsoft.CodeAnalysis.Document
Microsoft.CodeAnalysis.Document.WithFolders(System.Collections.Generic.IEnumerable<string> folders) -> Microsoft.CodeAnalysis.Document
...
...
@@ -5,16 +8,7 @@ Microsoft.CodeAnalysis.Document.WithName(string name) -> Microsoft.CodeAnalysis.
Microsoft.CodeAnalysis.Editing.SyntaxGenerator.TypeExpression(Microsoft.CodeAnalysis.ITypeSymbol typeSymbol, bool addImport) -> Microsoft.CodeAnalysis.SyntaxNode
Microsoft.CodeAnalysis.Solution.WithDocumentFilePath(Microsoft.CodeAnalysis.DocumentId documentId, string filePath) -> Microsoft.CodeAnalysis.Solution
Microsoft.CodeAnalysis.Solution.WithDocumentName(Microsoft.CodeAnalysis.DocumentId documentId, string name) -> Microsoft.CodeAnalysis.Solution
Microsoft.CodeAnalysis.Workspace.OnAdditionalDocumentOpened(Microsoft.CodeAnalysis.DocumentId documentId, Microsoft.CodeAnalysis.Text.SourceTextContainer textContainer) -> void
Microsoft.CodeAnalysis.Workspace.OnDocumentInfoChanged(Microsoft.CodeAnalysis.DocumentId documentId, Microsoft.CodeAnalysis.DocumentInfo newInfo) -> void
Microsoft.CodeAnalysis.WorkspaceChangeKind.DocumentInfoChanged = 17 -> Microsoft.CodeAnalysis.WorkspaceChangeKind
abstract Microsoft.CodeAnalysis.Editing.SyntaxGenerator.AddEventHandler(Microsoft.CodeAnalysis.SyntaxNode event, Microsoft.CodeAnalysis.SyntaxNode handler) -> Microsoft.CodeAnalysis.SyntaxNode
abstract Microsoft.CodeAnalysis.Editing.SyntaxGenerator.LockStatement(Microsoft.CodeAnalysis.SyntaxNode expression, System.Collections.Generic.IEnumerable<Microsoft.CodeAnalysis.SyntaxNode> statements) -> Microsoft.CodeAnalysis.SyntaxNode
abstract Microsoft.CodeAnalysis.Editing.SyntaxGenerator.RemoveEventHandler(Microsoft.CodeAnalysis.SyntaxNode event, Microsoft.CodeAnalysis.SyntaxNode handler) -> Microsoft.CodeAnalysis.SyntaxNode
override Microsoft.CodeAnalysis.AdhocWorkspace.OpenAdditionalDocument(Microsoft.CodeAnalysis.DocumentId documentId) -> void
virtual Microsoft.CodeAnalysis.Workspace.ApplyDocumentInfoChanged(Microsoft.CodeAnalysis.DocumentId id, Microsoft.CodeAnalysis.DocumentInfo info) -> void
virtual Microsoft.CodeAnalysis.Workspace.CanApplyParseOptionChange(Microsoft.CodeAnalysis.ParseOptions oldOptions, Microsoft.CodeAnalysis.ParseOptions newOptions, Microsoft.CodeAnalysis.Project project) -> bool
virtual Microsoft.CodeAnalysis.Workspace.OpenAdditionalDocument(Microsoft.CodeAnalysis.DocumentId documentId) -> void
*REMOVED*Microsoft.CodeAnalysis.Workspace.OnAdditionalDocumentOpened(Microsoft.CodeAnalysis.DocumentId documentId, Microsoft.CodeAnalysis.Text.SourceTextContainer textContainer, bool isCurrentContext = true) -> void
*REMOVED*override Microsoft.CodeAnalysis.AdhocWorkspace.OpenAdditionalDocument(Microsoft.CodeAnalysis.DocumentId documentId, bool activate = true) -> void
*REMOVED*virtual Microsoft.CodeAnalysis.Workspace.OpenAdditionalDocument(Microsoft.CodeAnalysis.DocumentId documentId, bool activate = true) -> void
src/Workspaces/Core/Portable/Workspace/AdhocWorkspace.cs
浏览文件 @
818b0a72
...
...
@@ -177,7 +177,9 @@ public override void CloseDocument(DocumentId documentId)
/// <summary>
/// Puts the specified additional document into the open state.
/// </summary>
public
override
void
OpenAdditionalDocument
(
DocumentId
documentId
)
/// <param name="documentId">The <see cref="DocumentId"/> to open.</param>
/// <param name="activate">Ignored - not necessary for additional documents.</param>
public
override
void
OpenAdditionalDocument
(
DocumentId
documentId
,
bool
activate
=
true
)
{
var
doc
=
this
.
CurrentSolution
.
GetAdditionalDocument
(
documentId
);
if
(
doc
!=
null
)
...
...
src/Workspaces/Core/Portable/Workspace/Workspace_Editor.cs
浏览文件 @
818b0a72
...
...
@@ -152,7 +152,9 @@ public virtual void CloseDocument(DocumentId documentId)
/// <summary>
/// Open the specified additional document in the host environment.
/// </summary>
public
virtual
void
OpenAdditionalDocument
(
DocumentId
documentId
)
/// <param name="documentId">The <see cref="DocumentId"/> to open.</param>
/// <param name="activate">Ignored - not necessary for additional documents.</param>
public
virtual
void
OpenAdditionalDocument
(
DocumentId
documentId
,
bool
activate
=
true
)
{
this
.
CheckCanOpenDocuments
();
}
...
...
@@ -524,7 +526,13 @@ private void AddToOpenDocumentMap(DocumentId documentId)
}
}
protected
internal
void
OnAdditionalDocumentOpened
(
DocumentId
documentId
,
SourceTextContainer
textContainer
)
/// <summary>
/// To be called by the host when an ="AdditionalDocument" is opened in the editor.
/// </summary>
/// <param name="documentId">The <see cref="DocumentId"/>.</param>
/// <param name="textContainer">The <see cref="SourceTextContainer"/> for the open file additional document.</param>
/// <param name="isCurrentContext">Ignored - not necessary for Additional Files.</param>
protected
internal
void
OnAdditionalDocumentOpened
(
DocumentId
documentId
,
SourceTextContainer
textContainer
,
bool
isCurrentContext
=
true
)
{
CheckAdditionalDocumentIsInCurrentSolution
(
documentId
);
CheckDocumentIsClosed
(
documentId
);
...
...
src/Workspaces/Remote/Core/Services/RemoteWorkspace.cs
浏览文件 @
818b0a72
...
...
@@ -138,7 +138,9 @@ public override void CloseDocument(DocumentId documentId)
/// <summary>
/// Puts the specified additional document into the open state.
/// </summary>
public
override
void
OpenAdditionalDocument
(
DocumentId
documentId
)
/// <param name="documentId">The <see cref="DocumentId"/> to open.</param>
/// <param name="activate">Ignored - not necessary for additional documents.</param>
public
override
void
OpenAdditionalDocument
(
DocumentId
documentId
,
bool
activate
=
true
)
{
lock
(
_gate
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录