Skip to content

Merge master to master-vs-deps #36827

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JoeRobich merged 8 commits into from
Jun 27, 2019
Merged

Merge master to master-vs-deps #36827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
57a2902
Skip BasicEditAndContinue tests
JoeRobich Jun 25, 2019
91485fe
Remove spurious WpfFact attribute from BasicEnC
JoeRobich Jun 26, 2019
e282b94
Skip EditLambdaExpression test
JoeRobich Jun 26, 2019
aee05aa
Merge remote-tracking branch 'upstream/release/dev16.3-preview1' into…
RikkiGibson Jun 26, 2019
ad17516
Merge pull request #36801 from RikkiGibson/merge-3p1-to-master
RikkiGibson Jun 27, 2019
e65f0cb
Merge pull request #36799 from dotnet/dev/jorobich/skip-enc-tests
JoeRobich Jun 27, 2019
9593a4d
Merge branch 'master-vs-deps' into merges/master-to-master-vs-deps
JoeRobich Jun 27, 2019
bac4117
Merge remote-tracking branch 'origin/master-vs-deps' into merges/mast…
JoeRobich Jun 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/EditorFeatures/Core/EditorFeaturesResources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,4 +917,4 @@ Do you want to proceed?</value>
<data name="Toggling_line_comment" xml:space="preserve">
<value>Toggling line comment...</value>
</data>
</root>
</root>
6 changes: 1 addition & 5 deletions src/EditorFeatures/Test2/IntelliSense/CSharpCompletionCommandHandlerTests.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5475,12 +5475,8 @@ class C
Public AutomationTextString As String = "Hello from IntelliCode: Length"

Public Overrides Function ProvideCompletionsAsync(context As CompletionContext) As Task
Dim intelliCodeItem = CompletionItem.Create(displayText:="★ Length", filterText:="Length")
intelliCodeItem.AutomationText = AutomationTextString
context.AddItem(intelliCodeItem)

context.AddItem(CompletionItem.Create(displayText:="★ Length", filterText:="Length"))
context.AddItem(CompletionItem.Create(displayText:="★ Normalize", filterText:="Normalize"))
context.AddItem(CompletionItem.Create(displayText:="Normalize", filterText:="Normalize"))
context.AddItem(CompletionItem.Create(displayText:="Length", filterText:="Length"))
context.AddItem(CompletionItem.Create(displayText:="ToString()", filterText:="ToString"))
context.AddItem(CompletionItem.Create(displayText:="First()", filterText:="First"))
Expand Down
19 changes: 9 additions & 10 deletions src/VisualStudio/IntegrationTest/IntegrationTests/VisualBasic/BasicEditAndContinue.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public override async Task InitializeAsync()
VisualStudio.SolutionExplorer.AddProject(testProj, WellKnownProjectTemplates.ConsoleApplication, LanguageNames.VisualBasic);
}

[WpfFact]
[WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/36763")]
public void UpdateActiveStatementLeafNode()
{
VisualStudio.Editor.SetText(@"
Expand Down Expand Up @@ -64,7 +64,7 @@ End Module
VisualStudio.Debugger.CheckExpression("names(1)", "String", "\"bar\"");
}

[WpfFact]
[WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/36763")]
public void AddTryCatchAroundActiveStatement()
{
VisualStudio.Editor.SetText(@"
Expand Down Expand Up @@ -92,7 +92,7 @@ Catch ex As Exception
VisualStudio.Editor.Verify.CurrentLineText("End Try");
}

[WpfFact]
[WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/36763")]
public void EditLambdaExpression()
{
VisualStudio.Editor.SetText(@"
Expand Down Expand Up @@ -123,7 +123,7 @@ End Sub
VisualStudio.ErrorList.Verify.NoBuildErrors();
}

[WpfFact]
[WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/36763")]
public void EnCWhileDebuggingFromImmediateWindow()
{
VisualStudio.Editor.SetText(@"
Expand All @@ -146,7 +146,6 @@ End Sub
VisualStudio.Debugger.ExecuteStatement("Module1.Main()");
}

[WpfFact]
private void SetupMultiProjectSolution()
{
var basicLibrary = new ProjectUtils.Project("BasicLibrary1");
Expand Down Expand Up @@ -188,7 +187,7 @@ End Module
VisualStudio.Workspace.WaitForAsyncOperations(Helper.HangMitigatingTimeout, FeatureAttribute.Workspace);
}

[WpfFact]
[WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/36763")]
public void MultiProjectDebuggingWhereNotAllModulesAreLoaded()
{
SetupMultiProjectSolution();
Expand All @@ -199,7 +198,7 @@ public void MultiProjectDebuggingWhereNotAllModulesAreLoaded()
VisualStudio.ErrorList.Verify.NoErrors();
}

[WpfFact]
[WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/36763")]
[WorkItem(33829, "https://github.com/dotnet/roslyn/issues/33829")]
public void DocumentStateTrackingReadonlyInRunMode()
{
Expand Down Expand Up @@ -250,7 +249,7 @@ End Module
VisualStudio.Editor.Verify.IsProjectItemDirty(expectedValue: false);
}

[WpfFact]
[WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/36763")]
public void LocalsWindowUpdatesAfterLocalGetsItsTypeUpdatedDuringEnC()
{
VisualStudio.Editor.SetText(@"
Expand All @@ -273,7 +272,7 @@ End Module
VisualStudio.LocalsWindow.Verify.CheckEntry("goo", "Single", "10");
}

[WpfFact]
[WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/36763")]
public void LocalsWindowUpdatesCorrectlyDuringEnC()
{
VisualStudio.Editor.SetText(@"
Expand Down Expand Up @@ -306,7 +305,7 @@ End Module
VisualStudio.LocalsWindow.Verify.CheckEntry("lLng", "Long", "444");
}

[WpfFact]
[WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/36763")]
public void WatchWindowUpdatesCorrectlyDuringEnC()
{
VisualStudio.Editor.SetText(@"
Expand Down