diff --git a/src/EditorFeatures/CSharp/CSharpEditorFeatures.csproj b/src/EditorFeatures/CSharp/CSharpEditorFeatures.csproj
index 4e768d14084625cc432ef06b671fd581e1a52e04..6d42fb08064c43fd2f7261587aad7e0fb66be1e3 100644
--- a/src/EditorFeatures/CSharp/CSharpEditorFeatures.csproj
+++ b/src/EditorFeatures/CSharp/CSharpEditorFeatures.csproj
@@ -193,21 +193,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/EditorFeatures/CSharp/CSharpEditorResources.Designer.cs b/src/EditorFeatures/CSharp/CSharpEditorResources.Designer.cs
index 4819e2db041de79e8edfa39cc1555a8ee5b8ca75..09cb8acc63c68e3ab2a9a5d0711fe9e11b325abf 100644
--- a/src/EditorFeatures/CSharp/CSharpEditorResources.Designer.cs
+++ b/src/EditorFeatures/CSharp/CSharpEditorResources.Designer.cs
@@ -69,15 +69,6 @@ internal class CSharpEditorResources {
}
}
- ///
- /// Looks up a localized string similar to Properties.
- ///
- internal static string Properties {
- get {
- return ResourceManager.GetString("Properties", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Smart Indenting.
///
diff --git a/src/EditorFeatures/CSharp/CSharpEditorResources.resx b/src/EditorFeatures/CSharp/CSharpEditorResources.resx
index fe637af5bc5a7a46f1df75a0a0e9f7a377b46f10..7be81d104edf6e0987992bfbec62a1649b5bdcad 100644
--- a/src/EditorFeatures/CSharp/CSharpEditorResources.resx
+++ b/src/EditorFeatures/CSharp/CSharpEditorResources.resx
@@ -123,7 +123,4 @@
Smart Indenting
-
- Properties
-
\ No newline at end of file
diff --git a/src/EditorFeatures/CSharpTest/SignatureHelp/AttributeSignatureHelpProviderTests.cs b/src/EditorFeatures/CSharpTest/SignatureHelp/AttributeSignatureHelpProviderTests.cs
index 4614857055b24fe4268dd59ce2a11b038f4bad6f..a7e590ea6b897e503715dcbcc739cd267de5b89e 100644
--- a/src/EditorFeatures/CSharpTest/SignatureHelp/AttributeSignatureHelpProviderTests.cs
+++ b/src/EditorFeatures/CSharpTest/SignatureHelp/AttributeSignatureHelpProviderTests.cs
@@ -2,9 +2,11 @@
using System.Collections.Generic;
using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Editor.CSharp.SignatureHelp;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.SignatureHelp;
using Microsoft.CodeAnalysis.Editor.UnitTests.SignatureHelp;
using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces;
+using Microsoft.CodeAnalysis.SignatureHelp;
using Roslyn.Test.Utilities;
using Xunit;
@@ -261,7 +263,7 @@ class D
}";
var expectedOrderedItems = new List();
- expectedOrderedItems.Add(new SignatureHelpTestItem($"SomethingAttribute({CSharpEditorResources.Properties}: [foo = int])", string.Empty, string.Empty, currentParameterIndex: 0));
+ expectedOrderedItems.Add(new SignatureHelpTestItem($"SomethingAttribute({CSharpFeaturesResources.Properties}: [foo = int])", string.Empty, string.Empty, currentParameterIndex: 0));
await TestAsync(markup, expectedOrderedItems, usePreviousCharAsTrigger: false);
}
@@ -347,7 +349,7 @@ class D
}";
var expectedOrderedItems = new List();
- expectedOrderedItems.Add(new SignatureHelpTestItem($"SomethingAttribute({CSharpEditorResources.Properties}: [foo = int])", string.Empty, string.Empty, currentParameterIndex: 0));
+ expectedOrderedItems.Add(new SignatureHelpTestItem($"SomethingAttribute({CSharpFeaturesResources.Properties}: [foo = int])", string.Empty, string.Empty, currentParameterIndex: 0));
// TODO: Bug 12319: Enable tests for script when this is fixed.
await TestAsync(markup, expectedOrderedItems, usePreviousCharAsTrigger: false);
@@ -478,7 +480,7 @@ class D
}";
var expectedOrderedItems = new List();
- expectedOrderedItems.Add(new SignatureHelpTestItem($"SomethingAttribute([int foo = 0], [string bar = null], {CSharpEditorResources.Properties}: [fieldbar = string], [fieldfoo = int])", string.Empty, "FooParameter", currentParameterIndex: 0));
+ expectedOrderedItems.Add(new SignatureHelpTestItem($"SomethingAttribute([int foo = 0], [string bar = null], {CSharpFeaturesResources.Properties}: [fieldbar = string], [fieldfoo = int])", string.Empty, "FooParameter", currentParameterIndex: 0));
// TODO: Bug 12319: Enable tests for script when this is fixed.
await TestAsync(markup, expectedOrderedItems, usePreviousCharAsTrigger: false);
@@ -505,7 +507,7 @@ class D
}";
var expectedOrderedItems = new List();
- expectedOrderedItems.Add(new SignatureHelpTestItem($"SomethingAttribute([int foo = 0], [string bar = null], {CSharpEditorResources.Properties}: [fieldbar = string], [fieldfoo = int])", string.Empty, "BarParameter", currentParameterIndex: 1));
+ expectedOrderedItems.Add(new SignatureHelpTestItem($"SomethingAttribute([int foo = 0], [string bar = null], {CSharpFeaturesResources.Properties}: [fieldbar = string], [fieldfoo = int])", string.Empty, "BarParameter", currentParameterIndex: 1));
// TODO: Bug 12319: Enable tests for script when this is fixed.
await TestAsync(markup, expectedOrderedItems, usePreviousCharAsTrigger: false);
@@ -532,7 +534,7 @@ class D
}";
var expectedOrderedItems = new List();
- expectedOrderedItems.Add(new SignatureHelpTestItem($"SomethingAttribute([int foo = 0], [string bar = null], {CSharpEditorResources.Properties}: [fieldbar = string], [fieldfoo = int])", string.Empty, string.Empty, currentParameterIndex: 2));
+ expectedOrderedItems.Add(new SignatureHelpTestItem($"SomethingAttribute([int foo = 0], [string bar = null], {CSharpFeaturesResources.Properties}: [fieldbar = string], [fieldfoo = int])", string.Empty, string.Empty, currentParameterIndex: 2));
// TODO: Bug 12319: Enable tests for script when this is fixed.
await TestAsync(markup, expectedOrderedItems, usePreviousCharAsTrigger: false);
@@ -557,7 +559,7 @@ class D
}";
var expectedOrderedItems = new List();
- expectedOrderedItems.Add(new SignatureHelpTestItem($"SomethingAttribute([int foo = 0], {CSharpEditorResources.Properties}: [foo = int])", string.Empty, "FooParameter", currentParameterIndex: 0));
+ expectedOrderedItems.Add(new SignatureHelpTestItem($"SomethingAttribute([int foo = 0], {CSharpFeaturesResources.Properties}: [foo = int])", string.Empty, "FooParameter", currentParameterIndex: 0));
// TODO: Bug 12319: Enable tests for script when this is fixed.
await TestAsync(markup, expectedOrderedItems, usePreviousCharAsTrigger: false);
@@ -582,7 +584,7 @@ class D
}";
var expectedOrderedItems = new List();
- expectedOrderedItems.Add(new SignatureHelpTestItem($"SomethingAttribute([int foo = 0], {CSharpEditorResources.Properties}: [foo = int])", string.Empty, string.Empty, currentParameterIndex: 1));
+ expectedOrderedItems.Add(new SignatureHelpTestItem($"SomethingAttribute([int foo = 0], {CSharpFeaturesResources.Properties}: [foo = int])", string.Empty, string.Empty, currentParameterIndex: 1));
// TODO: Bug 12319: Enable tests for script when this is fixed.
await TestAsync(markup, expectedOrderedItems, usePreviousCharAsTrigger: false);
diff --git a/src/EditorFeatures/CSharpTest/SignatureHelp/ConstructorInitializerSignatureHelpProviderTests.cs b/src/EditorFeatures/CSharpTest/SignatureHelp/ConstructorInitializerSignatureHelpProviderTests.cs
index 8af1ade5a066748285aaaa552f6225b75369cc91..2edf867ace5c561c711ec429b5dd1c891a929355 100644
--- a/src/EditorFeatures/CSharpTest/SignatureHelp/ConstructorInitializerSignatureHelpProviderTests.cs
+++ b/src/EditorFeatures/CSharpTest/SignatureHelp/ConstructorInitializerSignatureHelpProviderTests.cs
@@ -2,9 +2,10 @@
using System.Collections.Generic;
using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Editor.CSharp.SignatureHelp;
+using Microsoft.CodeAnalysis.CSharp.SignatureHelp;
using Microsoft.CodeAnalysis.Editor.UnitTests.SignatureHelp;
using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces;
+using Microsoft.CodeAnalysis.SignatureHelp;
using Roslyn.Test.Utilities;
using Xunit;
diff --git a/src/EditorFeatures/CSharpTest/SignatureHelp/ElementAccessExpressionSignatureHelpProviderTests.cs b/src/EditorFeatures/CSharpTest/SignatureHelp/ElementAccessExpressionSignatureHelpProviderTests.cs
index e801f752667b5885848bf7482a4da8340efb304d..6198e7b30baa89f511d97fdd44dfa41c40a26441 100644
--- a/src/EditorFeatures/CSharpTest/SignatureHelp/ElementAccessExpressionSignatureHelpProviderTests.cs
+++ b/src/EditorFeatures/CSharpTest/SignatureHelp/ElementAccessExpressionSignatureHelpProviderTests.cs
@@ -2,9 +2,10 @@
using System.Collections.Generic;
using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Editor.CSharp.SignatureHelp;
+using Microsoft.CodeAnalysis.CSharp.SignatureHelp;
using Microsoft.CodeAnalysis.Editor.UnitTests.SignatureHelp;
using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces;
+using Microsoft.CodeAnalysis.SignatureHelp;
using Roslyn.Test.Utilities;
using Xunit;
diff --git a/src/EditorFeatures/CSharpTest/SignatureHelp/GenericNamePartiallyWrittenSignatureHelpProviderTests.cs b/src/EditorFeatures/CSharpTest/SignatureHelp/GenericNamePartiallyWrittenSignatureHelpProviderTests.cs
index 6426bb23fc15f341aef40edfbb0784c0eb7ea44d..067cac4124a702db7a9d19e034019e215c866808 100644
--- a/src/EditorFeatures/CSharpTest/SignatureHelp/GenericNamePartiallyWrittenSignatureHelpProviderTests.cs
+++ b/src/EditorFeatures/CSharpTest/SignatureHelp/GenericNamePartiallyWrittenSignatureHelpProviderTests.cs
@@ -1,13 +1,14 @@
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Collections.Generic;
-using Microsoft.CodeAnalysis.Editor.CSharp.SignatureHelp;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.SignatureHelp;
using Microsoft.CodeAnalysis.Editor.UnitTests.SignatureHelp;
using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces;
+using Microsoft.CodeAnalysis.SignatureHelp;
using Roslyn.Test.Utilities;
using Xunit;
-using Microsoft.CodeAnalysis.CSharp;
-using System.Threading.Tasks;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.SignatureHelp
{
diff --git a/src/EditorFeatures/CSharpTest/SignatureHelp/GenericNameSignatureHelpProviderTests.cs b/src/EditorFeatures/CSharpTest/SignatureHelp/GenericNameSignatureHelpProviderTests.cs
index 9c23564a4e6a7ec88fdf25f321b81d32d73ad2a8..449a92ae7c0ea1ed536694a1fad399523cc41196 100644
--- a/src/EditorFeatures/CSharpTest/SignatureHelp/GenericNameSignatureHelpProviderTests.cs
+++ b/src/EditorFeatures/CSharpTest/SignatureHelp/GenericNameSignatureHelpProviderTests.cs
@@ -1,13 +1,14 @@
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Collections.Generic;
-using Microsoft.CodeAnalysis.Editor.CSharp.SignatureHelp;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.SignatureHelp;
using Microsoft.CodeAnalysis.Editor.UnitTests.SignatureHelp;
using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces;
+using Microsoft.CodeAnalysis.SignatureHelp;
using Roslyn.Test.Utilities;
using Xunit;
-using Microsoft.CodeAnalysis.CSharp;
-using System.Threading.Tasks;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.SignatureHelp
{
diff --git a/src/EditorFeatures/CSharpTest/SignatureHelp/InvocationExpressionSignatureHelpProviderTests.cs b/src/EditorFeatures/CSharpTest/SignatureHelp/InvocationExpressionSignatureHelpProviderTests.cs
index 3f9c787ce3b9168514deb7c57e01292dcf5ff3d2..d29c9e5c8d86cda9de484b69bf10b6c376f7d2ab 100644
--- a/src/EditorFeatures/CSharpTest/SignatureHelp/InvocationExpressionSignatureHelpProviderTests.cs
+++ b/src/EditorFeatures/CSharpTest/SignatureHelp/InvocationExpressionSignatureHelpProviderTests.cs
@@ -1,14 +1,15 @@
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Collections.Generic;
-using Microsoft.CodeAnalysis.Editor.CSharp.SignatureHelp;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.SignatureHelp;
using Microsoft.CodeAnalysis.Editor.UnitTests.SignatureHelp;
using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces;
+using Microsoft.CodeAnalysis.SignatureHelp;
using Roslyn.Test.Utilities;
using Xunit;
-using Microsoft.CodeAnalysis.CSharp;
-using System.Linq;
-using System.Threading.Tasks;
namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.SignatureHelp
{
diff --git a/src/EditorFeatures/CSharpTest/SignatureHelp/ObjectCreationExpressionSignatureHelpProviderTests.cs b/src/EditorFeatures/CSharpTest/SignatureHelp/ObjectCreationExpressionSignatureHelpProviderTests.cs
index eb82743f70f9c3dd5233770eee5f663a4bca3275..7e669d6a3213b2d3602c322a86dc16d68d66435b 100644
--- a/src/EditorFeatures/CSharpTest/SignatureHelp/ObjectCreationExpressionSignatureHelpProviderTests.cs
+++ b/src/EditorFeatures/CSharpTest/SignatureHelp/ObjectCreationExpressionSignatureHelpProviderTests.cs
@@ -2,9 +2,10 @@
using System.Collections.Generic;
using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Editor.CSharp.SignatureHelp;
+using Microsoft.CodeAnalysis.CSharp.SignatureHelp;
using Microsoft.CodeAnalysis.Editor.UnitTests.SignatureHelp;
using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces;
+using Microsoft.CodeAnalysis.SignatureHelp;
using Roslyn.Test.Utilities;
using Xunit;
diff --git a/src/EditorFeatures/Core/CommandHandlers/SignatureHelpCommandHandler.cs b/src/EditorFeatures/Core/CommandHandlers/SignatureHelpCommandHandler.cs
index 5cb2147f356eb656762422a78aaa255157ba6487..63f4366d663776a86f3ac0c580a690ea603154c8 100644
--- a/src/EditorFeatures/Core/CommandHandlers/SignatureHelpCommandHandler.cs
+++ b/src/EditorFeatures/Core/CommandHandlers/SignatureHelpCommandHandler.cs
@@ -12,6 +12,7 @@
using Microsoft.CodeAnalysis.Host.Mef;
using Microsoft.CodeAnalysis.Shared.TestHooks;
using Microsoft.CodeAnalysis.Shared.Utilities;
+using Microsoft.CodeAnalysis.SignatureHelp;
using Microsoft.VisualStudio.Language.Intellisense;
using Microsoft.VisualStudio.Utilities;
diff --git a/src/EditorFeatures/Core/EditorFeatures.csproj b/src/EditorFeatures/Core/EditorFeatures.csproj
index 65dc684c09b8ce68fdad27261665f00ccf550178..53b25318ce0c256c9f557533604f5df048f7be95 100644
--- a/src/EditorFeatures/Core/EditorFeatures.csproj
+++ b/src/EditorFeatures/Core/EditorFeatures.csproj
@@ -254,17 +254,9 @@
-
-
-
-
-
-
-
-
@@ -515,9 +507,6 @@
-
-
-
diff --git a/src/EditorFeatures/Core/EditorFeaturesResources.Designer.cs b/src/EditorFeatures/Core/EditorFeaturesResources.Designer.cs
index e7d37260173e259fc4671b7b5f622db2c70dbc34..12b30addce18a2ec922755202625be993cc6f4a9 100644
--- a/src/EditorFeatures/Core/EditorFeaturesResources.Designer.cs
+++ b/src/EditorFeatures/Core/EditorFeaturesResources.Designer.cs
@@ -1888,15 +1888,6 @@ internal class EditorFeaturesResources {
}
}
- ///
- /// Looks up a localized string similar to Variadic SignatureHelpItem must have at least one parameter..
- ///
- internal static string VariadicSignaturehelpitemMustHaveOneParam {
- get {
- return ResourceManager.GetString("VariadicSignaturehelpitemMustHaveOneParam", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Preview Warning.
///
diff --git a/src/EditorFeatures/Core/EditorFeaturesResources.resx b/src/EditorFeatures/Core/EditorFeaturesResources.resx
index 417499b0d5fb3d686db1fc61b8cfef87ef771b6e..b55a442b577fb72d9752ffbb13b31741cc375fab 100644
--- a/src/EditorFeatures/Core/EditorFeaturesResources.resx
+++ b/src/EditorFeatures/Core/EditorFeaturesResources.resx
@@ -534,9 +534,6 @@
Finding span of previous sibling...
-
- Variadic SignatureHelpItem must have at least one parameter.
-
Rename: {0}
diff --git a/src/EditorFeatures/Core/Extensibility/SignatureHelp/ISignatureHelpPresenterSession.cs b/src/EditorFeatures/Core/Extensibility/SignatureHelp/ISignatureHelpPresenterSession.cs
index 01fb8a69e8c8e7d98a7ce563a320c833721557f5..18218a20c16f0548f96194320ae6db593c481e97 100644
--- a/src/EditorFeatures/Core/Extensibility/SignatureHelp/ISignatureHelpPresenterSession.cs
+++ b/src/EditorFeatures/Core/Extensibility/SignatureHelp/ISignatureHelpPresenterSession.cs
@@ -2,6 +2,7 @@
using System;
using System.Collections.Generic;
+using Microsoft.CodeAnalysis.SignatureHelp;
using Microsoft.VisualStudio.Text;
namespace Microsoft.CodeAnalysis.Editor
diff --git a/src/EditorFeatures/Core/Extensibility/SignatureHelp/SignatureHelpItemEventArgs.cs b/src/EditorFeatures/Core/Extensibility/SignatureHelp/SignatureHelpItemEventArgs.cs
index 91a9e0365fb76a73156059bf01a8f8b8c5f523bc..58bb4365383a0baae1f4dc1944fff9e224b372bf 100644
--- a/src/EditorFeatures/Core/Extensibility/SignatureHelp/SignatureHelpItemEventArgs.cs
+++ b/src/EditorFeatures/Core/Extensibility/SignatureHelp/SignatureHelpItemEventArgs.cs
@@ -1,6 +1,7 @@
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
+using Microsoft.CodeAnalysis.SignatureHelp;
namespace Microsoft.CodeAnalysis.Editor
{
diff --git a/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Controller.Session_ComputeModel.cs b/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Controller.Session_ComputeModel.cs
index b059934ff7b958234152e2c95f4213cf90f5c951..3030e649ae4f7d152689e56c046c2e5260f8aba5 100644
--- a/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Controller.Session_ComputeModel.cs
+++ b/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Controller.Session_ComputeModel.cs
@@ -10,6 +10,7 @@
using Microsoft.CodeAnalysis.Internal.Log;
using Microsoft.CodeAnalysis.LanguageServices;
using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.SignatureHelp;
using Microsoft.CodeAnalysis.Text;
using Microsoft.VisualStudio.Text;
using Roslyn.Utilities;
diff --git a/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Controller.Session_SetModelSelectedItem.cs b/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Controller.Session_SetModelSelectedItem.cs
index fbddae707b26de24dbde086e5e3c8d9f66ddb9ce..bcd06f536433277e94def09df206fa8c0d961897 100644
--- a/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Controller.Session_SetModelSelectedItem.cs
+++ b/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Controller.Session_SetModelSelectedItem.cs
@@ -1,6 +1,7 @@
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
+using Microsoft.CodeAnalysis.SignatureHelp;
using Roslyn.Utilities;
namespace Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.SignatureHelp
diff --git a/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Controller.Session_UpdateModel.cs b/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Controller.Session_UpdateModel.cs
index 4d507982c0fef0109feed2c4b22cdee40aaf32f0..dfe4ce028ba3a92d88a35ed3fde2f7df403864b6 100644
--- a/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Controller.Session_UpdateModel.cs
+++ b/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Controller.Session_UpdateModel.cs
@@ -5,6 +5,7 @@
using System.Linq;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.SignatureHelp;
using Roslyn.Utilities;
namespace Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.SignatureHelp
diff --git a/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Controller.cs b/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Controller.cs
index aa1b723b3741c173e8aeab9ae436c0ae64f9aa71..348f3971b9b05463f0626ec0892aa162c321e49e 100644
--- a/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Controller.cs
+++ b/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Controller.cs
@@ -6,6 +6,7 @@
using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
using Microsoft.CodeAnalysis.Host.Mef;
using Microsoft.CodeAnalysis.Shared.TestHooks;
+using Microsoft.CodeAnalysis.SignatureHelp;
using Microsoft.CodeAnalysis.Text;
using Microsoft.VisualStudio.Language.Intellisense;
using Microsoft.VisualStudio.Text;
diff --git a/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Controller_InvokeSignatureHelp.cs b/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Controller_InvokeSignatureHelp.cs
index 7fd1f1bc849b6be6c1e74602c8516a0d561065b0..2f4a454cc0671de93f0f7a36e8131d62039ba739 100644
--- a/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Controller_InvokeSignatureHelp.cs
+++ b/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Controller_InvokeSignatureHelp.cs
@@ -2,6 +2,7 @@
using System;
using Microsoft.CodeAnalysis.Editor.Commands;
+using Microsoft.CodeAnalysis.SignatureHelp;
namespace Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.SignatureHelp
{
diff --git a/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Controller_TypeChar.cs b/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Controller_TypeChar.cs
index 9cdbcf159de998e05c4eee7edb53e5ee75773960..ca6f7ff868523bbf4df1e78a60f19a988707cb59 100644
--- a/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Controller_TypeChar.cs
+++ b/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Controller_TypeChar.cs
@@ -5,6 +5,7 @@
using System.Linq;
using Microsoft.CodeAnalysis.Editor.Commands;
using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
+using Microsoft.CodeAnalysis.SignatureHelp;
namespace Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.SignatureHelp
{
diff --git a/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Model.cs b/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Model.cs
index 35c62d942ce00f559e6bf61719a557e25889f1f9..3f4e8e6a6fc082bca8ac5100708b1a8f37935937 100644
--- a/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Model.cs
+++ b/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Model.cs
@@ -1,6 +1,7 @@
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Collections.Generic;
+using Microsoft.CodeAnalysis.SignatureHelp;
using Microsoft.CodeAnalysis.Text;
using Microsoft.CodeAnalysis.Text.Shared.Extensions;
using Microsoft.VisualStudio.Text;
diff --git a/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Presentation/Parameter.cs b/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Presentation/Parameter.cs
index cfea61d1168766d77f465ae78c6011bfe89f3511..c76e8a9083c4242dd6ca4073b065ca8288df088f 100644
--- a/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Presentation/Parameter.cs
+++ b/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Presentation/Parameter.cs
@@ -2,6 +2,7 @@
using System.Threading;
using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.SignatureHelp;
using Microsoft.VisualStudio.Language.Intellisense;
using Microsoft.VisualStudio.Text;
diff --git a/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Presentation/Signature.cs b/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Presentation/Signature.cs
index ef31ec715b7d1fbc2c68566d40c1d3f9db3cbecc..38750eefd3f509b4384288414fd99db611b7ead0 100644
--- a/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Presentation/Signature.cs
+++ b/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Presentation/Signature.cs
@@ -1,15 +1,16 @@
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
-using System.Linq;
using System.Collections.Generic;
using System.Collections.ObjectModel;
+using System.Linq;
using System.Text;
+using System.Threading;
using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.SignatureHelp;
using Microsoft.VisualStudio.Language.Intellisense;
using Microsoft.VisualStudio.Text;
using Roslyn.Utilities;
-using System.Threading;
namespace Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.SignatureHelp.Presentation
{
diff --git a/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Presentation/SignatureHelpPresenter.SignatureHelpPresenterSession.cs b/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Presentation/SignatureHelpPresenter.SignatureHelpPresenterSession.cs
index 6cb8dbb920988eaa29cb90bff683f16041a85074..de03f9749f0634e84440b47211448596c0cd3b59 100644
--- a/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Presentation/SignatureHelpPresenter.SignatureHelpPresenterSession.cs
+++ b/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/Presentation/SignatureHelpPresenter.SignatureHelpPresenterSession.cs
@@ -5,6 +5,7 @@
using System.Linq;
using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
+using Microsoft.CodeAnalysis.SignatureHelp;
using Microsoft.VisualStudio.Language.Intellisense;
using Microsoft.VisualStudio.Text;
using Microsoft.VisualStudio.Text.Editor;
diff --git a/src/EditorFeatures/Test/SignatureHelp/AbstractSignatureHelpProviderTests.cs b/src/EditorFeatures/Test/SignatureHelp/AbstractSignatureHelpProviderTests.cs
index 9bf87aa0480610bbdc58e91c2342efbcdcf3bfa2..71c6b5861b4e74cbfef29a4528650351f991687f 100644
--- a/src/EditorFeatures/Test/SignatureHelp/AbstractSignatureHelpProviderTests.cs
+++ b/src/EditorFeatures/Test/SignatureHelp/AbstractSignatureHelpProviderTests.cs
@@ -1,6 +1,5 @@
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-using System;
using System.Collections.Generic;
using System.Linq;
using System.Security;
@@ -8,12 +7,11 @@
using System.Threading.Tasks;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.SignatureHelp.Presentation;
-using Microsoft.CodeAnalysis.Editor.UnitTests.Classification;
using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces;
-using Microsoft.CodeAnalysis.Host;
using Microsoft.CodeAnalysis.LanguageServices;
using Microsoft.CodeAnalysis.Options;
using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.SignatureHelp;
using Microsoft.CodeAnalysis.Text;
using Roslyn.Test.Utilities;
using Roslyn.Utilities;
diff --git a/src/EditorFeatures/Test2/IntelliSense/SignatureHelpControllerTests.vb b/src/EditorFeatures/Test2/IntelliSense/SignatureHelpControllerTests.vb
index cde1dd8f9feb4f647d5acb38c82417ed9b1f44c2..770aea76df31ac1aa7d8acb68bb45af83205d64b 100644
--- a/src/EditorFeatures/Test2/IntelliSense/SignatureHelpControllerTests.vb
+++ b/src/EditorFeatures/Test2/IntelliSense/SignatureHelpControllerTests.vb
@@ -9,6 +9,7 @@ Imports Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense
Imports Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.SignatureHelp
Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
Imports Microsoft.CodeAnalysis.Shared.TestHooks
+Imports Microsoft.CodeAnalysis.SignatureHelp
Imports Microsoft.CodeAnalysis.Text
Imports Microsoft.VisualStudio.Language.Intellisense
Imports Microsoft.VisualStudio.Text
diff --git a/src/EditorFeatures/Test2/IntelliSense/TestSignatureHelpPresenterSession.vb b/src/EditorFeatures/Test2/IntelliSense/TestSignatureHelpPresenterSession.vb
index 22b9d359b47cf49eed6bd5a1a43b1d3d727f9a47..957a86d02aa28740df21a6bfd8e7191792995b02 100644
--- a/src/EditorFeatures/Test2/IntelliSense/TestSignatureHelpPresenterSession.vb
+++ b/src/EditorFeatures/Test2/IntelliSense/TestSignatureHelpPresenterSession.vb
@@ -1,5 +1,6 @@
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+Imports Microsoft.CodeAnalysis.SignatureHelp
Imports Microsoft.VisualStudio.Text
Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense
diff --git a/src/EditorFeatures/Test2/IntelliSense/TestState.vb b/src/EditorFeatures/Test2/IntelliSense/TestState.vb
index 807f476248b1fddfc46ae7de18eb1f2d9f8da2b0..8f0457712c27dea3fa9376a78b243f3b5b843739 100644
--- a/src/EditorFeatures/Test2/IntelliSense/TestState.vb
+++ b/src/EditorFeatures/Test2/IntelliSense/TestState.vb
@@ -10,6 +10,7 @@ Imports Microsoft.CodeAnalysis.Editor.Host
Imports Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.Completion
Imports Microsoft.CodeAnalysis.Host.Mef
Imports Microsoft.CodeAnalysis.Shared.TestHooks
+Imports Microsoft.CodeAnalysis.SignatureHelp
Imports Microsoft.VisualStudio.Composition
Imports Microsoft.VisualStudio.Language.Intellisense
Imports Microsoft.VisualStudio.Text
diff --git a/src/EditorFeatures/VisualBasic/BasicEditorFeatures.vbproj b/src/EditorFeatures/VisualBasic/BasicEditorFeatures.vbproj
index 9e051a0709836c427fdebcde9d9e90d926e51681..184ae5dbdc7e5a5dabfb1959d80e2cd210dbc428 100644
--- a/src/EditorFeatures/VisualBasic/BasicEditorFeatures.vbproj
+++ b/src/EditorFeatures/VisualBasic/BasicEditorFeatures.vbproj
@@ -204,30 +204,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/EditorFeatures/VisualBasic/VBEditorResources.Designer.vb b/src/EditorFeatures/VisualBasic/VBEditorResources.Designer.vb
index bca02841b02371f57547e013d28889c7d3e7af7c..75cfb060bd9ced19a769a0298a2665fe663755b5 100644
--- a/src/EditorFeatures/VisualBasic/VBEditorResources.Designer.vb
+++ b/src/EditorFeatures/VisualBasic/VBEditorResources.Designer.vb
@@ -1,7 +1,7 @@
'------------------------------------------------------------------------------
'
' This code was generated by a tool.
-' Runtime Version:4.0.30319.0
+' Runtime Version:4.0.30319.42000
'
' Changes to this file may cause incorrect behavior and will be lost if
' the code is regenerated.
@@ -222,15 +222,6 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic
End Get
End Property
- '''
- ''' Looks up a localized string similar to Properties.
- '''
- Friend ReadOnly Property Properties() As String
- Get
- Return ResourceManager.GetString("Properties", resourceCulture)
- End Get
- End Property
-
'''
''' Looks up a localized string similar to Smart Indenting.
'''
diff --git a/src/EditorFeatures/VisualBasic/VBEditorResources.resx b/src/EditorFeatures/VisualBasic/VBEditorResources.resx
index b57c34f4595b48f96cc7b3edf90a3826dacde50e..07efc7865a24e8d3542d8c1dc0192aa48c10f365 100644
--- a/src/EditorFeatures/VisualBasic/VBEditorResources.resx
+++ b/src/EditorFeatures/VisualBasic/VBEditorResources.resx
@@ -171,9 +171,6 @@
<Multiple Types>
-
- Properties
-
not supported
diff --git a/src/EditorFeatures/VisualBasicTest/SignatureHelp/AbstractVisualBasicSignatureHelpProviderTests.vb b/src/EditorFeatures/VisualBasicTest/SignatureHelp/AbstractVisualBasicSignatureHelpProviderTests.vb
index c94a72bf33faaaeed3672511191b14adf755dd69..408eb79f5278abe30d2c370ed9fb37e4683cf41f 100644
--- a/src/EditorFeatures/VisualBasicTest/SignatureHelp/AbstractVisualBasicSignatureHelpProviderTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/SignatureHelp/AbstractVisualBasicSignatureHelpProviderTests.vb
@@ -2,8 +2,6 @@
Imports Microsoft.CodeAnalysis.Editor.UnitTests.SignatureHelp
Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
-Imports Microsoft.CodeAnalysis.Text
-Imports Roslyn
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.SignatureHelp
Public MustInherit Class AbstractVisualBasicSignatureHelpProviderTests
diff --git a/src/EditorFeatures/VisualBasicTest/SignatureHelp/AddRemoveHandlerSignatureHelpProviderTests.vb b/src/EditorFeatures/VisualBasicTest/SignatureHelp/AddRemoveHandlerSignatureHelpProviderTests.vb
index c3ee83685e745ec90e20de07e69fce38d7946f29..74dd1624729c38779db5fe0d6e0c446cd462a5f2 100644
--- a/src/EditorFeatures/VisualBasicTest/SignatureHelp/AddRemoveHandlerSignatureHelpProviderTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/SignatureHelp/AddRemoveHandlerSignatureHelpProviderTests.vb
@@ -1,9 +1,9 @@
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-Imports System.Threading.Tasks
Imports Microsoft.CodeAnalysis.Editor.UnitTests.SignatureHelp
Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
-Imports Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
+Imports Microsoft.CodeAnalysis.SignatureHelp
+Imports Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.SignatureHelp
Public Class AddRemoveHandlerSignatureHelpProviderTests
diff --git a/src/EditorFeatures/VisualBasicTest/SignatureHelp/AttributeSignatureHelpProviderTests.vb b/src/EditorFeatures/VisualBasicTest/SignatureHelp/AttributeSignatureHelpProviderTests.vb
index a35920652e4bd1791629c152ac4065d37de3072d..5f453d2634147b68bece76f08c0eef7af691d2cb 100644
--- a/src/EditorFeatures/VisualBasicTest/SignatureHelp/AttributeSignatureHelpProviderTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/SignatureHelp/AttributeSignatureHelpProviderTests.vb
@@ -1,10 +1,9 @@
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-Imports System.ComponentModel.Composition.Hosting
-Imports System.Threading.Tasks
Imports Microsoft.CodeAnalysis.Editor.UnitTests.SignatureHelp
Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
-Imports Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
+Imports Microsoft.CodeAnalysis.SignatureHelp
+Imports Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.SignatureHelp
Public Class AttributeSignatureHelpProviderTests
diff --git a/src/EditorFeatures/VisualBasicTest/SignatureHelp/CastExpressionSignatureHelpProviderTests.vb b/src/EditorFeatures/VisualBasicTest/SignatureHelp/CastExpressionSignatureHelpProviderTests.vb
index 9e395a240900634b0c0af00360d33fd21d4b6ce6..b4df8889edf5f80da2bd0cf7d54327086294bcd0 100644
--- a/src/EditorFeatures/VisualBasicTest/SignatureHelp/CastExpressionSignatureHelpProviderTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/SignatureHelp/CastExpressionSignatureHelpProviderTests.vb
@@ -1,9 +1,9 @@
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-Imports System.Threading.Tasks
Imports Microsoft.CodeAnalysis.Editor.UnitTests.SignatureHelp
Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
-Imports Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
+Imports Microsoft.CodeAnalysis.SignatureHelp
+Imports Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.SignatureHelp
Public Class CastExpressionSignatureHelpProviderTests
diff --git a/src/EditorFeatures/VisualBasicTest/SignatureHelp/ConditionalExpressionSignatureHelpProviderTests.vb b/src/EditorFeatures/VisualBasicTest/SignatureHelp/ConditionalExpressionSignatureHelpProviderTests.vb
index 669e70d59d76ef13658c43a5a938e0592465c4f6..9c04810de741bfb69efa21b52e8735ed46c3cfa6 100644
--- a/src/EditorFeatures/VisualBasicTest/SignatureHelp/ConditionalExpressionSignatureHelpProviderTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/SignatureHelp/ConditionalExpressionSignatureHelpProviderTests.vb
@@ -1,9 +1,9 @@
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-Imports System.Threading.Tasks
Imports Microsoft.CodeAnalysis.Editor.UnitTests.SignatureHelp
Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
-Imports Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
+Imports Microsoft.CodeAnalysis.SignatureHelp
+Imports Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.SignatureHelp
Public Class BinaryConditionalExpressionSignatureHelpProviderTests
diff --git a/src/EditorFeatures/VisualBasicTest/SignatureHelp/FunctionAggregationSignatureHelpProviderTests.vb b/src/EditorFeatures/VisualBasicTest/SignatureHelp/FunctionAggregationSignatureHelpProviderTests.vb
index ba61d021a72885c7f6b24c5875ff529b2ac323c3..1c7a701ec535bdf470e2fa06ac1b46a0dd7053f1 100644
--- a/src/EditorFeatures/VisualBasicTest/SignatureHelp/FunctionAggregationSignatureHelpProviderTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/SignatureHelp/FunctionAggregationSignatureHelpProviderTests.vb
@@ -1,9 +1,9 @@
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-Imports System.Threading.Tasks
Imports Microsoft.CodeAnalysis.Editor.UnitTests.SignatureHelp
Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
-Imports Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
+Imports Microsoft.CodeAnalysis.SignatureHelp
+Imports Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
Imports Microsoft.CodeAnalysis.VisualBasic.VBFeaturesResources
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.SignatureHelp
diff --git a/src/EditorFeatures/VisualBasicTest/SignatureHelp/GenericNameSignatureHelpProviderTests.vb b/src/EditorFeatures/VisualBasicTest/SignatureHelp/GenericNameSignatureHelpProviderTests.vb
index 3bd9aee302214f48ff0e4f1ad7add701b1162a88..f44b56435586de100136dc680695b4f0a76d1e35 100644
--- a/src/EditorFeatures/VisualBasicTest/SignatureHelp/GenericNameSignatureHelpProviderTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/SignatureHelp/GenericNameSignatureHelpProviderTests.vb
@@ -1,9 +1,9 @@
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-Imports System.Threading.Tasks
Imports Microsoft.CodeAnalysis.Editor.UnitTests.SignatureHelp
Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
-Imports Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
+Imports Microsoft.CodeAnalysis.SignatureHelp
+Imports Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
Imports Microsoft.CodeAnalysis.VisualBasic.VBFeaturesResources
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.SignatureHelp
diff --git a/src/EditorFeatures/VisualBasicTest/SignatureHelp/GetTypeExpressionSignatureHelpProviderTests.vb b/src/EditorFeatures/VisualBasicTest/SignatureHelp/GetTypeExpressionSignatureHelpProviderTests.vb
index 160ff7ad8f2b7867ab79588c5237cc16e1008a64..6df77016affd7947c36f4b044119435a5e2a388a 100644
--- a/src/EditorFeatures/VisualBasicTest/SignatureHelp/GetTypeExpressionSignatureHelpProviderTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/SignatureHelp/GetTypeExpressionSignatureHelpProviderTests.vb
@@ -1,9 +1,9 @@
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-Imports System.Threading.Tasks
Imports Microsoft.CodeAnalysis.Editor.UnitTests.SignatureHelp
Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
-Imports Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
+Imports Microsoft.CodeAnalysis.SignatureHelp
+Imports Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.SignatureHelp
Public Class GetTypeExpressionSignatureHelpProviderTests
diff --git a/src/EditorFeatures/VisualBasicTest/SignatureHelp/GetXmlNamespaceExpressionSignatureHelpProviderTests.vb b/src/EditorFeatures/VisualBasicTest/SignatureHelp/GetXmlNamespaceExpressionSignatureHelpProviderTests.vb
index 9ffc9bfadb174a3c7b7a0f98325590eeb69c782a..4413dfc5fc084a9de1977145bcf13d69f393ecfa 100644
--- a/src/EditorFeatures/VisualBasicTest/SignatureHelp/GetXmlNamespaceExpressionSignatureHelpProviderTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/SignatureHelp/GetXmlNamespaceExpressionSignatureHelpProviderTests.vb
@@ -1,9 +1,9 @@
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-Imports System.Threading.Tasks
Imports Microsoft.CodeAnalysis.Editor.UnitTests.SignatureHelp
Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
-Imports Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
+Imports Microsoft.CodeAnalysis.SignatureHelp
+Imports Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.SignatureHelp
Public Class GetXmlNamespaceExpressionSignatureHelpProviderTests
diff --git a/src/EditorFeatures/VisualBasicTest/SignatureHelp/InvocationExpressionSignatureHelpProviderTests.vb b/src/EditorFeatures/VisualBasicTest/SignatureHelp/InvocationExpressionSignatureHelpProviderTests.vb
index 289a2d50b2034ea6149166c8e759a85977f3b5bd..75a639da6c2ea46569fc7f24da1ff5749e78957e 100644
--- a/src/EditorFeatures/VisualBasicTest/SignatureHelp/InvocationExpressionSignatureHelpProviderTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/SignatureHelp/InvocationExpressionSignatureHelpProviderTests.vb
@@ -1,9 +1,9 @@
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-Imports System.Threading.Tasks
Imports Microsoft.CodeAnalysis.Editor.UnitTests.SignatureHelp
Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
-Imports Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
+Imports Microsoft.CodeAnalysis.SignatureHelp
+Imports Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
Imports Microsoft.CodeAnalysis.VisualBasic.VBFeaturesResources
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.SignatureHelp
diff --git a/src/EditorFeatures/VisualBasicTest/SignatureHelp/MidAssignmentSignatureHelpProviderTests.vb b/src/EditorFeatures/VisualBasicTest/SignatureHelp/MidAssignmentSignatureHelpProviderTests.vb
index 7fc7e9ae4a4e359ba26124fa49eb63c016c4b9f7..b9b4b1f17a0a1f6f4eb462b64e653f00fd72982f 100644
--- a/src/EditorFeatures/VisualBasicTest/SignatureHelp/MidAssignmentSignatureHelpProviderTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/SignatureHelp/MidAssignmentSignatureHelpProviderTests.vb
@@ -1,9 +1,9 @@
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-Imports System.Threading.Tasks
Imports Microsoft.CodeAnalysis.Editor.UnitTests.SignatureHelp
Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
-Imports Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
+Imports Microsoft.CodeAnalysis.SignatureHelp
+Imports Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.SignatureHelp
Public Class MidAssignmentSignatureHelpProviderTests
diff --git a/src/EditorFeatures/VisualBasicTest/SignatureHelp/ObjectCreationExpressionSignatureHelpProviderTests.vb b/src/EditorFeatures/VisualBasicTest/SignatureHelp/ObjectCreationExpressionSignatureHelpProviderTests.vb
index c17a4903043a99e20c3c514b7fbbe9d0c2d79e28..9a5113dc050a5c55416a52d0ed45ca3e44b47d3b 100644
--- a/src/EditorFeatures/VisualBasicTest/SignatureHelp/ObjectCreationExpressionSignatureHelpProviderTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/SignatureHelp/ObjectCreationExpressionSignatureHelpProviderTests.vb
@@ -1,10 +1,9 @@
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-Imports System.ComponentModel.Composition.Hosting
-Imports System.Threading.Tasks
Imports Microsoft.CodeAnalysis.Editor.UnitTests.SignatureHelp
Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
-Imports Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
+Imports Microsoft.CodeAnalysis.SignatureHelp
+Imports Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.SignatureHelp
diff --git a/src/EditorFeatures/VisualBasicTest/SignatureHelp/PredefinedCastExpressionSignatureHelpProviderTests.vb b/src/EditorFeatures/VisualBasicTest/SignatureHelp/PredefinedCastExpressionSignatureHelpProviderTests.vb
index d3f645f3c4519ddcf8af690f9e48fbb1ed937f21..4c622e2044dee6b16195e804d6c692d88c6422b6 100644
--- a/src/EditorFeatures/VisualBasicTest/SignatureHelp/PredefinedCastExpressionSignatureHelpProviderTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/SignatureHelp/PredefinedCastExpressionSignatureHelpProviderTests.vb
@@ -1,9 +1,9 @@
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-Imports System.Threading.Tasks
Imports Microsoft.CodeAnalysis.Editor.UnitTests.SignatureHelp
Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
-Imports Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
+Imports Microsoft.CodeAnalysis.SignatureHelp
+Imports Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.SignatureHelp
Public Class PredefinedCastExpressionSignatureHelpProviderTests
diff --git a/src/EditorFeatures/VisualBasicTest/SignatureHelp/RaiseEventStatementSignatureHelpProviderTests.vb b/src/EditorFeatures/VisualBasicTest/SignatureHelp/RaiseEventStatementSignatureHelpProviderTests.vb
index 9fd6643486ea725043d78376b0a3d2917d5418da..f68a77543e30c46844424f776328da5f134e799c 100644
--- a/src/EditorFeatures/VisualBasicTest/SignatureHelp/RaiseEventStatementSignatureHelpProviderTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/SignatureHelp/RaiseEventStatementSignatureHelpProviderTests.vb
@@ -1,10 +1,9 @@
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-Imports System.ComponentModel.Composition.Hosting
-Imports System.Threading.Tasks
Imports Microsoft.CodeAnalysis.Editor.UnitTests.SignatureHelp
Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
-Imports Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
+Imports Microsoft.CodeAnalysis.SignatureHelp
+Imports Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.SignatureHelp
Public Class RaiseEventStatementSignatureHelpProviderTests
diff --git a/src/Features/CSharp/Portable/CSharpFeatures.csproj b/src/Features/CSharp/Portable/CSharpFeatures.csproj
index aa6c7551aba0c0c2418f124c971a3682c58a0c4d..fff106a786278fe3aef966e9838dbcd0f3a66a35 100644
--- a/src/Features/CSharp/Portable/CSharpFeatures.csproj
+++ b/src/Features/CSharp/Portable/CSharpFeatures.csproj
@@ -346,6 +346,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Features/CSharp/Portable/CSharpFeaturesResources.Designer.cs b/src/Features/CSharp/Portable/CSharpFeaturesResources.Designer.cs
index bfab6ec680dcef1a05c9af2ed56744c0f4bbce54..ccc7147a337a2d29875c2645e227e7d27cf90d5b 100644
--- a/src/Features/CSharp/Portable/CSharpFeaturesResources.Designer.cs
+++ b/src/Features/CSharp/Portable/CSharpFeaturesResources.Designer.cs
@@ -143,7 +143,7 @@ internal class CSharpFeaturesResources {
}
///
- /// Looks up a localized string similar to can't determine valid range of statements to extract out.
+ /// Looks up a localized string similar to Can't determine valid range of statements to extract.
///
internal static string CantDetermineValidRangeOfStatements {
get {
@@ -593,7 +593,7 @@ internal class CSharpFeaturesResources {
}
///
- /// Looks up a localized string similar to no valid statement range to extract out.
+ /// Looks up a localized string similar to No valid statement range to extract.
///
internal static string NoValidStatementRangeToExtractOut {
get {
@@ -637,6 +637,15 @@ internal class CSharpFeaturesResources {
}
}
+ ///
+ /// Looks up a localized string similar to Properties.
+ ///
+ internal static string Properties {
+ get {
+ return ResourceManager.GetString("Properties", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to property getter.
///
@@ -863,7 +872,7 @@ internal class CSharpFeaturesResources {
}
///
- /// Looks up a localized string similar to the selection contains syntactic errors.
+ /// Looks up a localized string similar to The selection contains syntactic errors.
///
internal static string TheSelectionContainsSyntacticErrors {
get {
diff --git a/src/Features/CSharp/Portable/CSharpFeaturesResources.resx b/src/Features/CSharp/Portable/CSharpFeaturesResources.resx
index b1a7e54b52a3c899f05ee48adf9767266d560f8e..1e7dd614662dd2fa0fe88b566ae8379a9de43f1f 100644
--- a/src/Features/CSharp/Portable/CSharpFeaturesResources.resx
+++ b/src/Features/CSharp/Portable/CSharpFeaturesResources.resx
@@ -437,4 +437,7 @@
Delegate invocation can be simplified.
-
+
+ Properties
+
+
\ No newline at end of file
diff --git a/src/EditorFeatures/CSharp/SignatureHelp/AbstractCSharpSignatureHelpProvider.cs b/src/Features/CSharp/Portable/SignatureHelp/AbstractCSharpSignatureHelpProvider.cs
similarity index 93%
rename from src/EditorFeatures/CSharp/SignatureHelp/AbstractCSharpSignatureHelpProvider.cs
rename to src/Features/CSharp/Portable/SignatureHelp/AbstractCSharpSignatureHelpProvider.cs
index b2ecacd5ccc16970f0135829073ec7a2ee1f514f..f86517b0a77d5c17296e6549cd7867d6436db2dd 100644
--- a/src/EditorFeatures/CSharp/SignatureHelp/AbstractCSharpSignatureHelpProvider.cs
+++ b/src/Features/CSharp/Portable/SignatureHelp/AbstractCSharpSignatureHelpProvider.cs
@@ -2,13 +2,12 @@
using System.Collections.Generic;
using System.Threading;
-using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.DocumentationComments;
-using Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.SignatureHelp;
using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.SignatureHelp;
using Roslyn.Utilities;
-namespace Microsoft.CodeAnalysis.Editor.CSharp.SignatureHelp
+namespace Microsoft.CodeAnalysis.CSharp.SignatureHelp
{
internal abstract class AbstractCSharpSignatureHelpProvider : AbstractSignatureHelpProvider
{
diff --git a/src/EditorFeatures/CSharp/SignatureHelp/AttributeSignatureHelpProvider.cs b/src/Features/CSharp/Portable/SignatureHelp/AttributeSignatureHelpProvider.cs
similarity index 97%
rename from src/EditorFeatures/CSharp/SignatureHelp/AttributeSignatureHelpProvider.cs
rename to src/Features/CSharp/Portable/SignatureHelp/AttributeSignatureHelpProvider.cs
index 542793aeb4e75578da67dafcbd885209f153a6cd..c6a52efee5b9ae0aacd58915289bcf1460588388 100644
--- a/src/EditorFeatures/CSharp/SignatureHelp/AttributeSignatureHelpProvider.cs
+++ b/src/Features/CSharp/Portable/SignatureHelp/AttributeSignatureHelpProvider.cs
@@ -1,24 +1,24 @@
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Collections.Generic;
+using System.Composition;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.CSharp.Extensions;
using Microsoft.CodeAnalysis.CSharp.Symbols;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.DocumentationComments;
-using Microsoft.CodeAnalysis.Editor.SignatureHelp;
using Microsoft.CodeAnalysis.LanguageServices;
using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.SignatureHelp;
using Microsoft.CodeAnalysis.Text;
using Roslyn.Utilities;
-namespace Microsoft.CodeAnalysis.Editor.CSharp.SignatureHelp
+namespace Microsoft.CodeAnalysis.CSharp.SignatureHelp
{
- [ExportSignatureHelpProvider("AttributeSignatureHelpProvider", LanguageNames.CSharp)]
+ [ExportSignatureHelpProvider("AttributeSignatureHelpProvider", LanguageNames.CSharp), Shared]
internal partial class AttributeSignatureHelpProvider : AbstractCSharpSignatureHelpProvider
{
public override bool IsTriggerCharacter(char ch)
@@ -189,7 +189,7 @@ private static List GetParameterPrefixDisplayParts(int i)
{
return new List
{
- new SymbolDisplayPart(SymbolDisplayPartKind.Text, null, CSharpEditorResources.Properties),
+ new SymbolDisplayPart(SymbolDisplayPartKind.Text, null, CSharpFeaturesResources.Properties),
Punctuation(SyntaxKind.ColonToken),
Space()
};
diff --git a/src/EditorFeatures/CSharp/SignatureHelp/ConstructorInitializerSignatureHelpProvider.cs b/src/Features/CSharp/Portable/SignatureHelp/ConstructorInitializerSignatureHelpProvider.cs
similarity index 97%
rename from src/EditorFeatures/CSharp/SignatureHelp/ConstructorInitializerSignatureHelpProvider.cs
rename to src/Features/CSharp/Portable/SignatureHelp/ConstructorInitializerSignatureHelpProvider.cs
index 9a6280e36f22fb3d7e0748a21c92a721989b7df3..e6f31b9336302af5a0762ae7e1ed3e6747b30320 100644
--- a/src/EditorFeatures/CSharp/SignatureHelp/ConstructorInitializerSignatureHelpProvider.cs
+++ b/src/Features/CSharp/Portable/SignatureHelp/ConstructorInitializerSignatureHelpProvider.cs
@@ -1,23 +1,23 @@
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Collections.Generic;
+using System.Composition;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.CSharp.Extensions;
using Microsoft.CodeAnalysis.CSharp.Symbols;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.DocumentationComments;
-using Microsoft.CodeAnalysis.Editor.SignatureHelp;
using Microsoft.CodeAnalysis.LanguageServices;
using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.SignatureHelp;
using Microsoft.CodeAnalysis.Text;
-namespace Microsoft.CodeAnalysis.Editor.CSharp.SignatureHelp
+namespace Microsoft.CodeAnalysis.CSharp.SignatureHelp
{
- [ExportSignatureHelpProvider("ConstructorInitializerSignatureHelpProvider", LanguageNames.CSharp)]
+ [ExportSignatureHelpProvider("ConstructorInitializerSignatureHelpProvider", LanguageNames.CSharp), Shared]
internal partial class ConstructorInitializerSignatureHelpProvider : AbstractCSharpSignatureHelpProvider
{
public override bool IsTriggerCharacter(char ch)
diff --git a/src/EditorFeatures/CSharp/SignatureHelp/ElementAccessExpressionSignatureHelpProvider.cs b/src/Features/CSharp/Portable/SignatureHelp/ElementAccessExpressionSignatureHelpProvider.cs
similarity index 99%
rename from src/EditorFeatures/CSharp/SignatureHelp/ElementAccessExpressionSignatureHelpProvider.cs
rename to src/Features/CSharp/Portable/SignatureHelp/ElementAccessExpressionSignatureHelpProvider.cs
index ad1b3c271fd6db8a191b39c3921c54afc6301963..2381c4a5a6e21d181a3c1df2e27ee51df2d7a6d0 100644
--- a/src/EditorFeatures/CSharp/SignatureHelp/ElementAccessExpressionSignatureHelpProvider.cs
+++ b/src/Features/CSharp/Portable/SignatureHelp/ElementAccessExpressionSignatureHelpProvider.cs
@@ -1,24 +1,24 @@
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Collections.Generic;
+using System.Composition;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.CSharp.Extensions;
using Microsoft.CodeAnalysis.CSharp.Symbols;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.DocumentationComments;
-using Microsoft.CodeAnalysis.Editor.SignatureHelp;
using Microsoft.CodeAnalysis.LanguageServices;
using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.SignatureHelp;
using Microsoft.CodeAnalysis.Text;
using Roslyn.Utilities;
-namespace Microsoft.CodeAnalysis.Editor.CSharp.SignatureHelp
+namespace Microsoft.CodeAnalysis.CSharp.SignatureHelp
{
- [ExportSignatureHelpProvider("ElementAccessExpressionSignatureHelpProvider", LanguageNames.CSharp)]
+ [ExportSignatureHelpProvider("ElementAccessExpressionSignatureHelpProvider", LanguageNames.CSharp), Shared]
internal sealed class ElementAccessExpressionSignatureHelpProvider : AbstractCSharpSignatureHelpProvider
{
public override bool IsTriggerCharacter(char ch)
diff --git a/src/EditorFeatures/CSharp/SignatureHelp/GenericNamePartiallyWrittenSignatureHelpProvider.cs b/src/Features/CSharp/Portable/SignatureHelp/GenericNamePartiallyWrittenSignatureHelpProvider.cs
similarity index 88%
rename from src/EditorFeatures/CSharp/SignatureHelp/GenericNamePartiallyWrittenSignatureHelpProvider.cs
rename to src/Features/CSharp/Portable/SignatureHelp/GenericNamePartiallyWrittenSignatureHelpProvider.cs
index 851c66eab7a104d9dcc17e220ddc95997fc0cc81..225a3a47eb2d3546f87f9d186096e8934d7ac151 100644
--- a/src/EditorFeatures/CSharp/SignatureHelp/GenericNamePartiallyWrittenSignatureHelpProvider.cs
+++ b/src/Features/CSharp/Portable/SignatureHelp/GenericNamePartiallyWrittenSignatureHelpProvider.cs
@@ -1,15 +1,16 @@
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+using System.Composition;
using System.Threading;
-using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.CSharp.Extensions;
using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.SignatureHelp;
using Microsoft.CodeAnalysis.Text;
using Roslyn.Utilities;
-namespace Microsoft.CodeAnalysis.Editor.CSharp.SignatureHelp
+namespace Microsoft.CodeAnalysis.CSharp.SignatureHelp
{
- [ExportSignatureHelpProvider("GenericNamePartiallyWrittenSignatureHelpProvider", LanguageNames.CSharp)]
+ [ExportSignatureHelpProvider("GenericNamePartiallyWrittenSignatureHelpProvider", LanguageNames.CSharp), Shared]
internal class GenericNamePartiallyWrittenSignatureHelpProvider : GenericNameSignatureHelpProvider
{
protected override bool TryGetGenericIdentifier(SyntaxNode root, int position, ISyntaxFactsService syntaxFacts, SignatureHelpTriggerReason triggerReason, CancellationToken cancellationToken, out SyntaxToken genericIdentifier, out SyntaxToken lessThanToken)
diff --git a/src/EditorFeatures/CSharp/SignatureHelp/GenericNameSignatureHelpProvider.cs b/src/Features/CSharp/Portable/SignatureHelp/GenericNameSignatureHelpProvider.cs
similarity index 98%
rename from src/EditorFeatures/CSharp/SignatureHelp/GenericNameSignatureHelpProvider.cs
rename to src/Features/CSharp/Portable/SignatureHelp/GenericNameSignatureHelpProvider.cs
index a152b4e90b70f5b8bb7ff112c7394eeef042c8fc..82a646ce10ef2c72292b6a321ef878ea848698ba 100644
--- a/src/EditorFeatures/CSharp/SignatureHelp/GenericNameSignatureHelpProvider.cs
+++ b/src/Features/CSharp/Portable/SignatureHelp/GenericNameSignatureHelpProvider.cs
@@ -1,24 +1,24 @@
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Collections.Generic;
+using System.Composition;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.CSharp.Extensions;
using Microsoft.CodeAnalysis.CSharp.Symbols;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.DocumentationComments;
-using Microsoft.CodeAnalysis.Editor.SignatureHelp;
using Microsoft.CodeAnalysis.LanguageServices;
using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.SignatureHelp;
using Microsoft.CodeAnalysis.Text;
using Roslyn.Utilities;
-namespace Microsoft.CodeAnalysis.Editor.CSharp.SignatureHelp
+namespace Microsoft.CodeAnalysis.CSharp.SignatureHelp
{
- [ExportSignatureHelpProvider("GenericNameSignatureHelpProvider", LanguageNames.CSharp)]
+ [ExportSignatureHelpProvider("GenericNameSignatureHelpProvider", LanguageNames.CSharp), Shared]
internal partial class GenericNameSignatureHelpProvider : AbstractCSharpSignatureHelpProvider
{
public override bool IsTriggerCharacter(char ch)
diff --git a/src/EditorFeatures/CSharp/SignatureHelp/GenericNameSignatureHelpProvider_Method.cs b/src/Features/CSharp/Portable/SignatureHelp/GenericNameSignatureHelpProvider_Method.cs
similarity index 97%
rename from src/EditorFeatures/CSharp/SignatureHelp/GenericNameSignatureHelpProvider_Method.cs
rename to src/Features/CSharp/Portable/SignatureHelp/GenericNameSignatureHelpProvider_Method.cs
index f58d70c07a0573b837218b533b844493d6e5b21b..6af9714d9aebb3891a6b9c98eb19e380eef5c441 100644
--- a/src/EditorFeatures/CSharp/SignatureHelp/GenericNameSignatureHelpProvider_Method.cs
+++ b/src/Features/CSharp/Portable/SignatureHelp/GenericNameSignatureHelpProvider_Method.cs
@@ -1,10 +1,9 @@
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Collections.Generic;
-using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.Shared.Extensions;
-namespace Microsoft.CodeAnalysis.Editor.CSharp.SignatureHelp
+namespace Microsoft.CodeAnalysis.CSharp.SignatureHelp
{
internal partial class GenericNameSignatureHelpProvider
{
diff --git a/src/EditorFeatures/CSharp/SignatureHelp/GenericNameSignatureHelpProvider_NamedType.cs b/src/Features/CSharp/Portable/SignatureHelp/GenericNameSignatureHelpProvider_NamedType.cs
similarity index 90%
rename from src/EditorFeatures/CSharp/SignatureHelp/GenericNameSignatureHelpProvider_NamedType.cs
rename to src/Features/CSharp/Portable/SignatureHelp/GenericNameSignatureHelpProvider_NamedType.cs
index 2d6994ae8505e439663ba85a98d1e0bd171f32bc..2519bac958d9df1b51f8b35709dec354e8d3cc8c 100644
--- a/src/EditorFeatures/CSharp/SignatureHelp/GenericNameSignatureHelpProvider_NamedType.cs
+++ b/src/Features/CSharp/Portable/SignatureHelp/GenericNameSignatureHelpProvider_NamedType.cs
@@ -1,9 +1,8 @@
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Collections.Generic;
-using Microsoft.CodeAnalysis.CSharp;
-namespace Microsoft.CodeAnalysis.Editor.CSharp.SignatureHelp
+namespace Microsoft.CodeAnalysis.CSharp.SignatureHelp
{
internal partial class GenericNameSignatureHelpProvider
{
diff --git a/src/EditorFeatures/CSharp/SignatureHelp/InvocationExpressionSignatureHelpProvider.cs b/src/Features/CSharp/Portable/SignatureHelp/InvocationExpressionSignatureHelpProvider.cs
similarity index 97%
rename from src/EditorFeatures/CSharp/SignatureHelp/InvocationExpressionSignatureHelpProvider.cs
rename to src/Features/CSharp/Portable/SignatureHelp/InvocationExpressionSignatureHelpProvider.cs
index 47bd93612568d90960271785e6e086e769101767..8e7c56915511c2e51961d0e115cf9d0c597951d3 100644
--- a/src/EditorFeatures/CSharp/SignatureHelp/InvocationExpressionSignatureHelpProvider.cs
+++ b/src/Features/CSharp/Portable/SignatureHelp/InvocationExpressionSignatureHelpProvider.cs
@@ -1,22 +1,22 @@
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+using System.Composition;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.CSharp.Extensions;
using Microsoft.CodeAnalysis.CSharp.Symbols;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.DocumentationComments;
-using Microsoft.CodeAnalysis.Editor.SignatureHelp;
using Microsoft.CodeAnalysis.LanguageServices;
using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.SignatureHelp;
using Microsoft.CodeAnalysis.Text;
-namespace Microsoft.CodeAnalysis.Editor.CSharp.SignatureHelp
+namespace Microsoft.CodeAnalysis.CSharp.SignatureHelp
{
- [ExportSignatureHelpProvider("InvocationExpressionSignatureHelpProvider", LanguageNames.CSharp)]
+ [ExportSignatureHelpProvider("InvocationExpressionSignatureHelpProvider", LanguageNames.CSharp), Shared]
internal partial class InvocationExpressionSignatureHelpProvider : AbstractCSharpSignatureHelpProvider
{
public override bool IsTriggerCharacter(char ch)
diff --git a/src/EditorFeatures/CSharp/SignatureHelp/InvocationExpressionSignatureHelpProvider_DelegateInvoke.cs b/src/Features/CSharp/Portable/SignatureHelp/InvocationExpressionSignatureHelpProvider_DelegateInvoke.cs
similarity index 97%
rename from src/EditorFeatures/CSharp/SignatureHelp/InvocationExpressionSignatureHelpProvider_DelegateInvoke.cs
rename to src/Features/CSharp/Portable/SignatureHelp/InvocationExpressionSignatureHelpProvider_DelegateInvoke.cs
index 07f2ea3e5d995b4502d0769b2b23b0c4cf87570e..05f0467094d82965eabb24f4ccb68e1e58c05890 100644
--- a/src/EditorFeatures/CSharp/SignatureHelp/InvocationExpressionSignatureHelpProvider_DelegateInvoke.cs
+++ b/src/Features/CSharp/Portable/SignatureHelp/InvocationExpressionSignatureHelpProvider_DelegateInvoke.cs
@@ -2,15 +2,15 @@
using System.Collections.Generic;
using System.Threading;
-using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.CSharp.Extensions;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.DocumentationComments;
using Microsoft.CodeAnalysis.LanguageServices;
using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.SignatureHelp;
using Roslyn.Utilities;
-namespace Microsoft.CodeAnalysis.Editor.CSharp.SignatureHelp
+namespace Microsoft.CodeAnalysis.CSharp.SignatureHelp
{
internal partial class InvocationExpressionSignatureHelpProvider
{
diff --git a/src/EditorFeatures/CSharp/SignatureHelp/InvocationExpressionSignatureHelpProvider_MethodGroup.cs b/src/Features/CSharp/Portable/SignatureHelp/InvocationExpressionSignatureHelpProvider_MethodGroup.cs
similarity index 98%
rename from src/EditorFeatures/CSharp/SignatureHelp/InvocationExpressionSignatureHelpProvider_MethodGroup.cs
rename to src/Features/CSharp/Portable/SignatureHelp/InvocationExpressionSignatureHelpProvider_MethodGroup.cs
index 82b1a7cc1680b929e4433f2d09adc9e13bded6cc..af9496955f5db6f90f57cb917227fb8452d0851a 100644
--- a/src/EditorFeatures/CSharp/SignatureHelp/InvocationExpressionSignatureHelpProvider_MethodGroup.cs
+++ b/src/Features/CSharp/Portable/SignatureHelp/InvocationExpressionSignatureHelpProvider_MethodGroup.cs
@@ -3,16 +3,16 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading;
-using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.CSharp.Extensions;
using Microsoft.CodeAnalysis.CSharp.Symbols;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.DocumentationComments;
using Microsoft.CodeAnalysis.LanguageServices;
using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.SignatureHelp;
using Roslyn.Utilities;
-namespace Microsoft.CodeAnalysis.Editor.CSharp.SignatureHelp
+namespace Microsoft.CodeAnalysis.CSharp.SignatureHelp
{
internal partial class InvocationExpressionSignatureHelpProvider
{
diff --git a/src/EditorFeatures/CSharp/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider.cs b/src/Features/CSharp/Portable/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider.cs
similarity index 96%
rename from src/EditorFeatures/CSharp/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider.cs
rename to src/Features/CSharp/Portable/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider.cs
index caf90f98b91184e0fd659090feac579cb32bba33..641e4cc903f9d488982a823075ee0f9795ec3333 100644
--- a/src/EditorFeatures/CSharp/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider.cs
+++ b/src/Features/CSharp/Portable/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider.cs
@@ -1,18 +1,18 @@
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+using System.Composition;
using System.Threading;
using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.DocumentationComments;
-using Microsoft.CodeAnalysis.Editor.SignatureHelp;
using Microsoft.CodeAnalysis.LanguageServices;
using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.SignatureHelp;
using Microsoft.CodeAnalysis.Text;
-namespace Microsoft.CodeAnalysis.Editor.CSharp.SignatureHelp
+namespace Microsoft.CodeAnalysis.CSharp.SignatureHelp
{
- [ExportSignatureHelpProvider("ObjectCreationExpressionSignatureHelpProvider", LanguageNames.CSharp)]
+ [ExportSignatureHelpProvider("ObjectCreationExpressionSignatureHelpProvider", LanguageNames.CSharp), Shared]
internal partial class ObjectCreationExpressionSignatureHelpProvider : AbstractCSharpSignatureHelpProvider
{
public override bool IsTriggerCharacter(char ch)
diff --git a/src/EditorFeatures/CSharp/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider_DelegateType.cs b/src/Features/CSharp/Portable/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider_DelegateType.cs
similarity index 97%
rename from src/EditorFeatures/CSharp/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider_DelegateType.cs
rename to src/Features/CSharp/Portable/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider_DelegateType.cs
index ad1d6aaa3f7d569ea93e32d612aa368842e4143b..85fcccdc00d16399765c3ae194f7200de2a26f6b 100644
--- a/src/EditorFeatures/CSharp/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider_DelegateType.cs
+++ b/src/Features/CSharp/Portable/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider_DelegateType.cs
@@ -2,12 +2,12 @@
using System.Collections.Generic;
using System.Threading;
-using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.SignatureHelp;
using Roslyn.Utilities;
-namespace Microsoft.CodeAnalysis.Editor.CSharp.SignatureHelp
+namespace Microsoft.CodeAnalysis.CSharp.SignatureHelp
{
internal partial class ObjectCreationExpressionSignatureHelpProvider
{
diff --git a/src/EditorFeatures/CSharp/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider_NormalType.cs b/src/Features/CSharp/Portable/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider_NormalType.cs
similarity index 97%
rename from src/EditorFeatures/CSharp/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider_NormalType.cs
rename to src/Features/CSharp/Portable/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider_NormalType.cs
index 9e9c39edcaa3ba9754134ca55915e3a42dc484fb..2da85b4852a9267fde9eb32a6362279ef491b32c 100644
--- a/src/EditorFeatures/CSharp/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider_NormalType.cs
+++ b/src/Features/CSharp/Portable/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider_NormalType.cs
@@ -4,15 +4,15 @@
using System.Linq;
using System.Threading;
using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.CSharp.Extensions;
using Microsoft.CodeAnalysis.CSharp.Symbols;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.DocumentationComments;
using Microsoft.CodeAnalysis.LanguageServices;
using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.SignatureHelp;
-namespace Microsoft.CodeAnalysis.Editor.CSharp.SignatureHelp
+namespace Microsoft.CodeAnalysis.CSharp.SignatureHelp
{
internal partial class ObjectCreationExpressionSignatureHelpProvider
{
diff --git a/src/EditorFeatures/CSharp/SignatureHelp/SignatureHelpUtilities.cs b/src/Features/CSharp/Portable/SignatureHelp/SignatureHelpUtilities.cs
similarity index 95%
rename from src/EditorFeatures/CSharp/SignatureHelp/SignatureHelpUtilities.cs
rename to src/Features/CSharp/Portable/SignatureHelp/SignatureHelpUtilities.cs
index e4133192d2cfb2d55b6c2924503e84239581295c..321f7563979195aee6b179865b65dcd6a6f2fbad 100644
--- a/src/EditorFeatures/CSharp/SignatureHelp/SignatureHelpUtilities.cs
+++ b/src/Features/CSharp/Portable/SignatureHelp/SignatureHelpUtilities.cs
@@ -3,16 +3,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Threading;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.CSharp.Extensions;
using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Editor.SignatureHelp;
-using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.SignatureHelp;
using Microsoft.CodeAnalysis.Text;
-namespace Microsoft.CodeAnalysis.Editor.CSharp.SignatureHelp
+namespace Microsoft.CodeAnalysis.CSharp.SignatureHelp
{
internal static class SignatureHelpUtilities
{
diff --git a/src/Features/Core/Portable/Features.csproj b/src/Features/Core/Portable/Features.csproj
index 1a4bdd6fcf44b4d54936d152f162f23946c0163a..f226eaf2d354dc08963ab60fd0235f561defd7e3 100644
--- a/src/Features/Core/Portable/Features.csproj
+++ b/src/Features/Core/Portable/Features.csproj
@@ -540,6 +540,17 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Features/Core/Portable/FeaturesResources.Designer.cs b/src/Features/Core/Portable/FeaturesResources.Designer.cs
index 783e50d9a16fd3345b7fbde30674b21ed3973c3f..d2d133a80f7b088f5f36dd3f9f5b611d53d93a85 100644
--- a/src/Features/Core/Portable/FeaturesResources.Designer.cs
+++ b/src/Features/Core/Portable/FeaturesResources.Designer.cs
@@ -2522,6 +2522,15 @@ internal class FeaturesResources {
}
}
+ ///
+ /// Looks up a localized string similar to Variadic SignatureHelpItem must have at least one parameter..
+ ///
+ internal static string VariadicSignaturehelpitemMustHaveOneParam {
+ get {
+ return ResourceManager.GetString("VariadicSignaturehelpitemMustHaveOneParam", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to An instance of analyzer {0} cannot be created from {1}: {2}..
///
diff --git a/src/Features/Core/Portable/FeaturesResources.resx b/src/Features/Core/Portable/FeaturesResources.resx
index 078b7863c4011df5a3cd1d00888022e810adcd04..ad5a696c651373752a75456ff4885dd286e3d805 100644
--- a/src/Features/Core/Portable/FeaturesResources.resx
+++ b/src/Features/Core/Portable/FeaturesResources.resx
@@ -961,4 +961,7 @@ This version used in: {2}
Add missing switch cases
+
+ Variadic SignatureHelpItem must have at least one parameter.
+
\ No newline at end of file
diff --git a/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/AbstractSignatureHelpProvider.SymbolKeySignatureHelpItem.cs b/src/Features/Core/Portable/SignatureHelp/AbstractSignatureHelpProvider.SymbolKeySignatureHelpItem.cs
similarity index 96%
rename from src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/AbstractSignatureHelpProvider.SymbolKeySignatureHelpItem.cs
rename to src/Features/Core/Portable/SignatureHelp/AbstractSignatureHelpProvider.SymbolKeySignatureHelpItem.cs
index db90b3cfe31df488ea4eac00967f1c274c3396d6..afc12e824c728e8ecfb9516db0805ddf742293fe 100644
--- a/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/AbstractSignatureHelpProvider.SymbolKeySignatureHelpItem.cs
+++ b/src/Features/Core/Portable/SignatureHelp/AbstractSignatureHelpProvider.SymbolKeySignatureHelpItem.cs
@@ -4,7 +4,7 @@
using System.Collections.Generic;
using System.Threading;
-namespace Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.SignatureHelp
+namespace Microsoft.CodeAnalysis.SignatureHelp
{
internal abstract partial class AbstractSignatureHelpProvider
{
diff --git a/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/AbstractSignatureHelpProvider.cs b/src/Features/Core/Portable/SignatureHelp/AbstractSignatureHelpProvider.cs
similarity index 99%
rename from src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/AbstractSignatureHelpProvider.cs
rename to src/Features/Core/Portable/SignatureHelp/AbstractSignatureHelpProvider.cs
index aa9b722bacfc2bf783de8079b33d0841e8f58fca..2cbd3209024d5b44ab6c852812a8c46a7675419f 100644
--- a/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/AbstractSignatureHelpProvider.cs
+++ b/src/Features/Core/Portable/SignatureHelp/AbstractSignatureHelpProvider.cs
@@ -11,7 +11,7 @@
using Microsoft.CodeAnalysis.Text;
using Roslyn.Utilities;
-namespace Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.SignatureHelp
+namespace Microsoft.CodeAnalysis.SignatureHelp
{
internal abstract partial class AbstractSignatureHelpProvider : ISignatureHelpProvider
{
diff --git a/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/CommonSignatureHelpUtilities.cs b/src/Features/Core/Portable/SignatureHelp/CommonSignatureHelpUtilities.cs
similarity index 99%
rename from src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/CommonSignatureHelpUtilities.cs
rename to src/Features/Core/Portable/SignatureHelp/CommonSignatureHelpUtilities.cs
index c6e5297bc9edfc8474035abba8911f8a37a538a8..fa5c9910248bfa58e61d762b74eba5a1c47bcadf 100644
--- a/src/EditorFeatures/Core/Implementation/IntelliSense/SignatureHelp/CommonSignatureHelpUtilities.cs
+++ b/src/Features/Core/Portable/SignatureHelp/CommonSignatureHelpUtilities.cs
@@ -9,7 +9,7 @@
using Microsoft.CodeAnalysis.Text;
using Roslyn.Utilities;
-namespace Microsoft.CodeAnalysis.Editor.SignatureHelp
+namespace Microsoft.CodeAnalysis.SignatureHelp
{
internal static class CommonSignatureHelpUtilities
{
diff --git a/src/EditorFeatures/Core/Extensibility/SignatureHelp/ExportSignatureHelpProviderAttribute.cs b/src/Features/Core/Portable/SignatureHelp/ExportSignatureHelpProviderAttribute.cs
similarity index 91%
rename from src/EditorFeatures/Core/Extensibility/SignatureHelp/ExportSignatureHelpProviderAttribute.cs
rename to src/Features/Core/Portable/SignatureHelp/ExportSignatureHelpProviderAttribute.cs
index 57c5f94cb25bdfa5ba2e4fa69c93be90b06546fa..63dd8a748fa01eb9023760fcfe038110999e4572 100644
--- a/src/EditorFeatures/Core/Extensibility/SignatureHelp/ExportSignatureHelpProviderAttribute.cs
+++ b/src/Features/Core/Portable/SignatureHelp/ExportSignatureHelpProviderAttribute.cs
@@ -1,9 +1,9 @@
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
-using System.ComponentModel.Composition;
+using System.Composition;
-namespace Microsoft.CodeAnalysis.Editor
+namespace Microsoft.CodeAnalysis.SignatureHelp
{
[MetadataAttribute]
[AttributeUsage(AttributeTargets.Class)]
diff --git a/src/EditorFeatures/Core/Extensibility/SignatureHelp/ISignatureHelpProvider.cs b/src/Features/Core/Portable/SignatureHelp/ISignatureHelpProvider.cs
similarity index 95%
rename from src/EditorFeatures/Core/Extensibility/SignatureHelp/ISignatureHelpProvider.cs
rename to src/Features/Core/Portable/SignatureHelp/ISignatureHelpProvider.cs
index 44384afa0605fe54b66aefc3e936aff10f0d21ff..45ed3a19bec4faceaf49666d2bdf67e554158edc 100644
--- a/src/EditorFeatures/Core/Extensibility/SignatureHelp/ISignatureHelpProvider.cs
+++ b/src/Features/Core/Portable/SignatureHelp/ISignatureHelpProvider.cs
@@ -3,7 +3,7 @@
using System.Threading;
using System.Threading.Tasks;
-namespace Microsoft.CodeAnalysis.Editor
+namespace Microsoft.CodeAnalysis.SignatureHelp
{
internal interface ISignatureHelpProvider
{
diff --git a/src/EditorFeatures/Core/Extensibility/SignatureHelp/SignatureHelpItem.cs b/src/Features/Core/Portable/SignatureHelp/SignatureHelpItem.cs
similarity index 95%
rename from src/EditorFeatures/Core/Extensibility/SignatureHelp/SignatureHelpItem.cs
rename to src/Features/Core/Portable/SignatureHelp/SignatureHelpItem.cs
index 3dd06233ab819600e90d102a84c751f7b7d01082..62bb5e46a5c25be1f28114166ffc8eae5ce9bd8b 100644
--- a/src/EditorFeatures/Core/Extensibility/SignatureHelp/SignatureHelpItem.cs
+++ b/src/Features/Core/Portable/SignatureHelp/SignatureHelpItem.cs
@@ -8,7 +8,7 @@
using Microsoft.CodeAnalysis;
using Roslyn.Utilities;
-namespace Microsoft.CodeAnalysis.Editor
+namespace Microsoft.CodeAnalysis.SignatureHelp
{
internal class SignatureHelpItem
{
@@ -46,7 +46,7 @@ internal class SignatureHelpItem
{
if (isVariadic && !parameters.Any())
{
- throw new ArgumentException(EditorFeaturesResources.VariadicSignaturehelpitemMustHaveOneParam);
+ throw new ArgumentException(FeaturesResources.VariadicSignaturehelpitemMustHaveOneParam);
}
this.IsVariadic = isVariadic;
diff --git a/src/EditorFeatures/Core/Extensibility/SignatureHelp/SignatureHelpItems.cs b/src/Features/Core/Portable/SignatureHelp/SignatureHelpItems.cs
similarity index 98%
rename from src/EditorFeatures/Core/Extensibility/SignatureHelp/SignatureHelpItems.cs
rename to src/Features/Core/Portable/SignatureHelp/SignatureHelpItems.cs
index 634531ea5af0101867042962bfa70092aa4f12de..1b7c5e04f2efd2e87c00b9f0902f40c450607faa 100644
--- a/src/EditorFeatures/Core/Extensibility/SignatureHelp/SignatureHelpItems.cs
+++ b/src/Features/Core/Portable/SignatureHelp/SignatureHelpItems.cs
@@ -7,7 +7,7 @@
using Microsoft.CodeAnalysis.Text;
using Roslyn.Utilities;
-namespace Microsoft.CodeAnalysis.Editor
+namespace Microsoft.CodeAnalysis.SignatureHelp
{
internal class SignatureHelpItems
{
diff --git a/src/EditorFeatures/Core/Extensibility/SignatureHelp/SignatureHelpParameter.cs b/src/Features/Core/Portable/SignatureHelp/SignatureHelpParameter.cs
similarity index 98%
rename from src/EditorFeatures/Core/Extensibility/SignatureHelp/SignatureHelpParameter.cs
rename to src/Features/Core/Portable/SignatureHelp/SignatureHelpParameter.cs
index 8777dbfc0e4abe13c527ebe516aadf6d13f10246..417031b979e0117655b93a24e945e9b767acc2b6 100644
--- a/src/EditorFeatures/Core/Extensibility/SignatureHelp/SignatureHelpParameter.cs
+++ b/src/Features/Core/Portable/SignatureHelp/SignatureHelpParameter.cs
@@ -7,7 +7,7 @@
using Microsoft.CodeAnalysis;
using Roslyn.Utilities;
-namespace Microsoft.CodeAnalysis.Editor
+namespace Microsoft.CodeAnalysis.SignatureHelp
{
internal class SignatureHelpParameter
{
diff --git a/src/EditorFeatures/Core/Extensibility/SignatureHelp/SignatureHelpState.cs b/src/Features/Core/Portable/SignatureHelp/SignatureHelpState.cs
similarity index 93%
rename from src/EditorFeatures/Core/Extensibility/SignatureHelp/SignatureHelpState.cs
rename to src/Features/Core/Portable/SignatureHelp/SignatureHelpState.cs
index 5c8e5212631851237cb592c3ab249b7c5ca2606e..b2fc5d2f12393d464e5616c75072bd58f3fab4c8 100644
--- a/src/EditorFeatures/Core/Extensibility/SignatureHelp/SignatureHelpState.cs
+++ b/src/Features/Core/Portable/SignatureHelp/SignatureHelpState.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
-namespace Microsoft.CodeAnalysis.Editor
+namespace Microsoft.CodeAnalysis.SignatureHelp
{
internal class SignatureHelpState
{
diff --git a/src/EditorFeatures/Core/Extensibility/SignatureHelp/SignatureHelpTriggerInfo.cs b/src/Features/Core/Portable/SignatureHelp/SignatureHelpTriggerInfo.cs
similarity index 94%
rename from src/EditorFeatures/Core/Extensibility/SignatureHelp/SignatureHelpTriggerInfo.cs
rename to src/Features/Core/Portable/SignatureHelp/SignatureHelpTriggerInfo.cs
index 3b89facae82987d90a0427787530749ed3e1a662..9b49bcca8bfb857ca92c5ffbc9fc71561ecc484f 100644
--- a/src/EditorFeatures/Core/Extensibility/SignatureHelp/SignatureHelpTriggerInfo.cs
+++ b/src/Features/Core/Portable/SignatureHelp/SignatureHelpTriggerInfo.cs
@@ -2,7 +2,7 @@
using Roslyn.Utilities;
-namespace Microsoft.CodeAnalysis.Editor
+namespace Microsoft.CodeAnalysis.SignatureHelp
{
internal struct SignatureHelpTriggerInfo
{
diff --git a/src/EditorFeatures/Core/Extensibility/SignatureHelp/SignatureHelpTriggerReason.cs b/src/Features/Core/Portable/SignatureHelp/SignatureHelpTriggerReason.cs
similarity index 93%
rename from src/EditorFeatures/Core/Extensibility/SignatureHelp/SignatureHelpTriggerReason.cs
rename to src/Features/Core/Portable/SignatureHelp/SignatureHelpTriggerReason.cs
index 211c9541de0bc58d728e1b4b8ae235d8c4de0622..8f4e0a35a37b7246a8f49e725539712b2a419df5 100644
--- a/src/EditorFeatures/Core/Extensibility/SignatureHelp/SignatureHelpTriggerReason.cs
+++ b/src/Features/Core/Portable/SignatureHelp/SignatureHelpTriggerReason.cs
@@ -1,6 +1,6 @@
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-namespace Microsoft.CodeAnalysis.Editor
+namespace Microsoft.CodeAnalysis.SignatureHelp
{
internal enum SignatureHelpTriggerReason
{
diff --git a/src/Features/VisualBasic/Portable/BasicFeatures.vbproj b/src/Features/VisualBasic/Portable/BasicFeatures.vbproj
index aeb9c3e89372f98227975da93ebb52c02420f126..4d370a4ec35aec63753ec1168a97a12b03685fa5 100644
--- a/src/Features/VisualBasic/Portable/BasicFeatures.vbproj
+++ b/src/Features/VisualBasic/Portable/BasicFeatures.vbproj
@@ -363,6 +363,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
True
diff --git a/src/EditorFeatures/VisualBasic/SignatureHelp/AbstractIntrinsicOperatorSignatureHelpProvider.vb b/src/Features/VisualBasic/Portable/SignatureHelp/AbstractIntrinsicOperatorSignatureHelpProvider.vb
similarity index 97%
rename from src/EditorFeatures/VisualBasic/SignatureHelp/AbstractIntrinsicOperatorSignatureHelpProvider.vb
rename to src/Features/VisualBasic/Portable/SignatureHelp/AbstractIntrinsicOperatorSignatureHelpProvider.vb
index 2bdb51c2400aa1d2608100cf270a241a35d91db3..f052922db470b98fbb4e6fb0211144608399ce7c 100644
--- a/src/EditorFeatures/VisualBasic/SignatureHelp/AbstractIntrinsicOperatorSignatureHelpProvider.vb
+++ b/src/Features/VisualBasic/Portable/SignatureHelp/AbstractIntrinsicOperatorSignatureHelpProvider.vb
@@ -1,13 +1,12 @@
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
Imports System.Threading
-Imports System.Threading.Tasks
-Imports Microsoft.CodeAnalysis.Editor.SignatureHelp
Imports Microsoft.CodeAnalysis.LanguageServices
+Imports Microsoft.CodeAnalysis.SignatureHelp
Imports Microsoft.CodeAnalysis.Text
Imports Microsoft.CodeAnalysis.VisualBasic.Utilities.IntrinsicOperators
-Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
+Namespace Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
Friend MustInherit Class AbstractIntrinsicOperatorSignatureHelpProvider(Of TSyntaxNode As SyntaxNode)
Inherits AbstractVisualBasicSignatureHelpProvider
diff --git a/src/EditorFeatures/VisualBasic/SignatureHelp/AbstractSignatureHelpProvider.vb b/src/Features/VisualBasic/Portable/SignatureHelp/AbstractSignatureHelpProvider.vb
similarity index 95%
rename from src/EditorFeatures/VisualBasic/SignatureHelp/AbstractSignatureHelpProvider.vb
rename to src/Features/VisualBasic/Portable/SignatureHelp/AbstractSignatureHelpProvider.vb
index b2507c5d54a3336ce803c10c8b517862d9cac147..78466c5d8dbe7e4024147e84c39e8ace24f9a52c 100644
--- a/src/EditorFeatures/VisualBasic/SignatureHelp/AbstractSignatureHelpProvider.vb
+++ b/src/Features/VisualBasic/Portable/SignatureHelp/AbstractSignatureHelpProvider.vb
@@ -2,9 +2,9 @@
Imports System.Threading
Imports Microsoft.CodeAnalysis.DocumentationComments
-Imports Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.SignatureHelp
+Imports Microsoft.CodeAnalysis.SignatureHelp
-Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
+Namespace Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
Friend MustInherit Class AbstractVisualBasicSignatureHelpProvider
Inherits AbstractSignatureHelpProvider
diff --git a/src/EditorFeatures/VisualBasic/SignatureHelp/AddRemoveHandlerSignatureHelpProvider.vb b/src/Features/VisualBasic/Portable/SignatureHelp/AddRemoveHandlerSignatureHelpProvider.vb
similarity index 92%
rename from src/EditorFeatures/VisualBasic/SignatureHelp/AddRemoveHandlerSignatureHelpProvider.vb
rename to src/Features/VisualBasic/Portable/SignatureHelp/AddRemoveHandlerSignatureHelpProvider.vb
index 171d5d934fc3675f93edda9bb36a949824a6b84d..1a5f54436db7328c49c2861a6feb5a9cb7fa0b63 100644
--- a/src/EditorFeatures/VisualBasic/SignatureHelp/AddRemoveHandlerSignatureHelpProvider.vb
+++ b/src/Features/VisualBasic/Portable/SignatureHelp/AddRemoveHandlerSignatureHelpProvider.vb
@@ -1,11 +1,13 @@
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+Imports System.Composition
Imports System.Threading
+Imports Microsoft.CodeAnalysis.SignatureHelp
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Imports Microsoft.CodeAnalysis.VisualBasic.Utilities.IntrinsicOperators
-Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
-
+Namespace Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
+
Friend Class AddRemoveHandlerSignatureHelpProvider
Inherits AbstractIntrinsicOperatorSignatureHelpProvider(Of AddRemoveHandlerStatementSyntax)
diff --git a/src/EditorFeatures/VisualBasic/SignatureHelp/AttributeSignatureHelpProvider.vb b/src/Features/VisualBasic/Portable/SignatureHelp/AttributeSignatureHelpProvider.vb
similarity index 97%
rename from src/EditorFeatures/VisualBasic/SignatureHelp/AttributeSignatureHelpProvider.vb
rename to src/Features/VisualBasic/Portable/SignatureHelp/AttributeSignatureHelpProvider.vb
index 12c5ca14eb23df95459957115ff13871db8ffdb3..f6b7e5eb604b5257ecc5e19ecb7e5917f931e145 100644
--- a/src/EditorFeatures/VisualBasic/SignatureHelp/AttributeSignatureHelpProvider.vb
+++ b/src/Features/VisualBasic/Portable/SignatureHelp/AttributeSignatureHelpProvider.vb
@@ -1,17 +1,17 @@
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+Imports System.Composition
Imports System.Threading
-Imports System.Threading.Tasks
Imports Microsoft.CodeAnalysis
Imports Microsoft.CodeAnalysis.DocumentationComments
-Imports Microsoft.CodeAnalysis.Editor.SignatureHelp
Imports Microsoft.CodeAnalysis.LanguageServices
+Imports Microsoft.CodeAnalysis.SignatureHelp
Imports Microsoft.CodeAnalysis.Text
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
-Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
+Namespace Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
-
+
Partial Friend Class AttributeSignatureHelpProvider
Inherits AbstractVisualBasicSignatureHelpProvider
@@ -162,7 +162,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
Private Shared Function GetParameterPrefixDisplayParts(i As Integer) As List(Of SymbolDisplayPart)
If i = 0 Then
Return New List(Of SymbolDisplayPart) From {
- New SymbolDisplayPart(SymbolDisplayPartKind.Text, Nothing, VBEditorResources.Properties),
+ New SymbolDisplayPart(SymbolDisplayPartKind.Text, Nothing, VBFeaturesResources.Properties),
Punctuation(SyntaxKind.ColonToken),
Space()
}
diff --git a/src/EditorFeatures/VisualBasic/SignatureHelp/CastExpressionSignatureHelpProvider.vb b/src/Features/VisualBasic/Portable/SignatureHelp/CastExpressionSignatureHelpProvider.vb
similarity index 90%
rename from src/EditorFeatures/VisualBasic/SignatureHelp/CastExpressionSignatureHelpProvider.vb
rename to src/Features/VisualBasic/Portable/SignatureHelp/CastExpressionSignatureHelpProvider.vb
index 350b8299cb5f5db09e683768635ed9fcace1d13e..28e32f563ed722ef1ca5715ff913a346d233cb33 100644
--- a/src/EditorFeatures/VisualBasic/SignatureHelp/CastExpressionSignatureHelpProvider.vb
+++ b/src/Features/VisualBasic/Portable/SignatureHelp/CastExpressionSignatureHelpProvider.vb
@@ -1,12 +1,14 @@
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+Imports System.Composition
Imports System.Threading
+Imports Microsoft.CodeAnalysis.SignatureHelp
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Imports Microsoft.CodeAnalysis.VisualBasic.Utilities.IntrinsicOperators
-Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
-
- Friend Partial Class CastExpressionSignatureHelpProvider
+Namespace Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
+
+ Partial Friend Class CastExpressionSignatureHelpProvider
Inherits AbstractIntrinsicOperatorSignatureHelpProvider(Of CastExpressionSyntax)
Protected Overrides Function GetIntrinsicOperatorDocumentation(node As CastExpressionSyntax, document As Document, cancellationToken As CancellationToken) As IEnumerable(Of AbstractIntrinsicOperatorDocumentation)
diff --git a/src/EditorFeatures/VisualBasic/SignatureHelp/ConditionalExpressionSignatureHelpProvider.vb b/src/Features/VisualBasic/Portable/SignatureHelp/ConditionalExpressionSignatureHelpProvider.vb
similarity index 91%
rename from src/EditorFeatures/VisualBasic/SignatureHelp/ConditionalExpressionSignatureHelpProvider.vb
rename to src/Features/VisualBasic/Portable/SignatureHelp/ConditionalExpressionSignatureHelpProvider.vb
index c768635dd483312d9b3691c26b51fef555dd6735..cc1cfbca84fb3cc92bd79970a7312c1d79fc94e0 100644
--- a/src/EditorFeatures/VisualBasic/SignatureHelp/ConditionalExpressionSignatureHelpProvider.vb
+++ b/src/Features/VisualBasic/Portable/SignatureHelp/ConditionalExpressionSignatureHelpProvider.vb
@@ -1,10 +1,12 @@
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+Imports System.Composition
Imports System.Threading
+Imports Microsoft.CodeAnalysis.SignatureHelp
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Imports Microsoft.CodeAnalysis.VisualBasic.Utilities.IntrinsicOperators
-Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
+Namespace Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
Friend MustInherit Class ConditionalExpressionSignatureHelpProvider(Of T As SyntaxNode)
Inherits AbstractIntrinsicOperatorSignatureHelpProvider(Of T)
@@ -34,7 +36,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
End Function
End Class
-
+
Friend Class BinaryConditionalExpressionSignatureHelpProvider
Inherits ConditionalExpressionSignatureHelpProvider(Of BinaryConditionalExpressionSyntax)
@@ -45,7 +47,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
End Property
End Class
-
+
Friend Class TernaryConditionalExpressionSignatureHelpProvider
Inherits ConditionalExpressionSignatureHelpProvider(Of TernaryConditionalExpressionSyntax)
diff --git a/src/EditorFeatures/VisualBasic/SignatureHelp/FunctionAggregationSignatureHelpProvider.vb b/src/Features/VisualBasic/Portable/SignatureHelp/FunctionAggregationSignatureHelpProvider.vb
similarity index 98%
rename from src/EditorFeatures/VisualBasic/SignatureHelp/FunctionAggregationSignatureHelpProvider.vb
rename to src/Features/VisualBasic/Portable/SignatureHelp/FunctionAggregationSignatureHelpProvider.vb
index 535daa8abf49d6bac53bb0a2b5bdc96f9434cac4..9407711c869b47b36209618b9235d1156653ebd5 100644
--- a/src/EditorFeatures/VisualBasic/SignatureHelp/FunctionAggregationSignatureHelpProvider.vb
+++ b/src/Features/VisualBasic/Portable/SignatureHelp/FunctionAggregationSignatureHelpProvider.vb
@@ -1,16 +1,16 @@
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+Imports System.Composition
Imports System.Threading
-Imports System.Threading.Tasks
Imports Microsoft.CodeAnalysis.DocumentationComments
-Imports Microsoft.CodeAnalysis.Editor.SignatureHelp
Imports Microsoft.CodeAnalysis.LanguageServices
+Imports Microsoft.CodeAnalysis.SignatureHelp
Imports Microsoft.CodeAnalysis.Text
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
-Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
+Namespace Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
-
+
Partial Friend Class FunctionAggregationSignatureHelpProvider
Inherits AbstractVisualBasicSignatureHelpProvider
diff --git a/src/EditorFeatures/VisualBasic/SignatureHelp/GenericNameSignatureHelpProvider.Method.vb b/src/Features/VisualBasic/Portable/SignatureHelp/GenericNameSignatureHelpProvider.Method.vb
similarity index 97%
rename from src/EditorFeatures/VisualBasic/SignatureHelp/GenericNameSignatureHelpProvider.Method.vb
rename to src/Features/VisualBasic/Portable/SignatureHelp/GenericNameSignatureHelpProvider.Method.vb
index 0578303121f338a2c497b056d77dd66d9a8f3c3c..7439d98588d5e8b0b76f1bc1479c83dd947d0f43 100644
--- a/src/EditorFeatures/VisualBasic/SignatureHelp/GenericNameSignatureHelpProvider.Method.vb
+++ b/src/Features/VisualBasic/Portable/SignatureHelp/GenericNameSignatureHelpProvider.Method.vb
@@ -1,6 +1,6 @@
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
+Namespace Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
Partial Friend Class GenericNameSignatureHelpProvider
diff --git a/src/EditorFeatures/VisualBasic/SignatureHelp/GenericNameSignatureHelpProvider.NamedType.vb b/src/Features/VisualBasic/Portable/SignatureHelp/GenericNameSignatureHelpProvider.NamedType.vb
similarity index 94%
rename from src/EditorFeatures/VisualBasic/SignatureHelp/GenericNameSignatureHelpProvider.NamedType.vb
rename to src/Features/VisualBasic/Portable/SignatureHelp/GenericNameSignatureHelpProvider.NamedType.vb
index fe810cafa7ac0cdad060f3055b8bfdc7764d3e1d..52fb82d64550aa626e431aee14c4a0112feeba65 100644
--- a/src/EditorFeatures/VisualBasic/SignatureHelp/GenericNameSignatureHelpProvider.NamedType.vb
+++ b/src/Features/VisualBasic/Portable/SignatureHelp/GenericNameSignatureHelpProvider.NamedType.vb
@@ -1,6 +1,6 @@
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
+Namespace Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
Partial Friend Class GenericNameSignatureHelpProvider
diff --git a/src/EditorFeatures/VisualBasic/SignatureHelp/GenericNameSignatureHelpProvider.vb b/src/Features/VisualBasic/Portable/SignatureHelp/GenericNameSignatureHelpProvider.vb
similarity index 98%
rename from src/EditorFeatures/VisualBasic/SignatureHelp/GenericNameSignatureHelpProvider.vb
rename to src/Features/VisualBasic/Portable/SignatureHelp/GenericNameSignatureHelpProvider.vb
index 014ea2f28cba03bc5b772228af3e6e22f743e87d..382619891bdf0f9503955e207c0ce5027602c1a7 100644
--- a/src/EditorFeatures/VisualBasic/SignatureHelp/GenericNameSignatureHelpProvider.vb
+++ b/src/Features/VisualBasic/Portable/SignatureHelp/GenericNameSignatureHelpProvider.vb
@@ -1,17 +1,17 @@
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+Imports System.Composition
Imports System.Threading
-Imports System.Threading.Tasks
Imports Microsoft.CodeAnalysis.DocumentationComments
-Imports Microsoft.CodeAnalysis.Editor.SignatureHelp
Imports Microsoft.CodeAnalysis.LanguageServices
+Imports Microsoft.CodeAnalysis.SignatureHelp
Imports Microsoft.CodeAnalysis.Text
Imports Microsoft.CodeAnalysis.VisualBasic.Symbols
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
-Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
+Namespace Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
-
+
Partial Friend Class GenericNameSignatureHelpProvider
Inherits AbstractVisualBasicSignatureHelpProvider
diff --git a/src/EditorFeatures/VisualBasic/SignatureHelp/GetTypeExpressionSignatureHelpProvider.vb b/src/Features/VisualBasic/Portable/SignatureHelp/GetTypeExpressionSignatureHelpProvider.vb
similarity index 86%
rename from src/EditorFeatures/VisualBasic/SignatureHelp/GetTypeExpressionSignatureHelpProvider.vb
rename to src/Features/VisualBasic/Portable/SignatureHelp/GetTypeExpressionSignatureHelpProvider.vb
index 23da71f984e58ff81f97ed94eb48130cd31d90b4..5404089f74c2503033c4e11b56d4cc34e52bd736 100644
--- a/src/EditorFeatures/VisualBasic/SignatureHelp/GetTypeExpressionSignatureHelpProvider.vb
+++ b/src/Features/VisualBasic/Portable/SignatureHelp/GetTypeExpressionSignatureHelpProvider.vb
@@ -1,12 +1,14 @@
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+Imports System.Composition
Imports System.Threading
+Imports Microsoft.CodeAnalysis.SignatureHelp
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Imports Microsoft.CodeAnalysis.VisualBasic.Utilities.IntrinsicOperators
-Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
-
- Friend Partial Class GetTypeExpressionSignatureHelpProvider
+Namespace Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
+
+ Partial Friend Class GetTypeExpressionSignatureHelpProvider
Inherits AbstractIntrinsicOperatorSignatureHelpProvider(Of GetTypeExpressionSyntax)
Protected Overrides Function GetIntrinsicOperatorDocumentation(node As GetTypeExpressionSyntax, document As Document, cancellationToken As CancellationToken) As IEnumerable(Of AbstractIntrinsicOperatorDocumentation)
diff --git a/src/EditorFeatures/VisualBasic/SignatureHelp/GetXmlNamespaceExpressionSignatureHelpProvider.vb b/src/Features/VisualBasic/Portable/SignatureHelp/GetXmlNamespaceExpressionSignatureHelpProvider.vb
similarity index 86%
rename from src/EditorFeatures/VisualBasic/SignatureHelp/GetXmlNamespaceExpressionSignatureHelpProvider.vb
rename to src/Features/VisualBasic/Portable/SignatureHelp/GetXmlNamespaceExpressionSignatureHelpProvider.vb
index 8c3b5674f96d82090e518e4c065671219809536a..f4c867ea082a4fffeb6014783cdf17a3f99e617a 100644
--- a/src/EditorFeatures/VisualBasic/SignatureHelp/GetXmlNamespaceExpressionSignatureHelpProvider.vb
+++ b/src/Features/VisualBasic/Portable/SignatureHelp/GetXmlNamespaceExpressionSignatureHelpProvider.vb
@@ -1,12 +1,14 @@
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+Imports System.Composition
Imports System.Threading
+Imports Microsoft.CodeAnalysis.SignatureHelp
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Imports Microsoft.CodeAnalysis.VisualBasic.Utilities.IntrinsicOperators
-Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
-
- Friend Partial Class GetXmlNamespaceExpressionSignatureHelpProvider
+Namespace Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
+
+ Partial Friend Class GetXmlNamespaceExpressionSignatureHelpProvider
Inherits AbstractIntrinsicOperatorSignatureHelpProvider(Of GetXmlNamespaceExpressionSyntax)
Protected Overrides Function GetIntrinsicOperatorDocumentation(node As GetXmlNamespaceExpressionSyntax, document As Document, cancellationToken As CancellationToken) As IEnumerable(Of AbstractIntrinsicOperatorDocumentation)
diff --git a/src/EditorFeatures/VisualBasic/SignatureHelp/InvocationExpressionSignatureHelpProvider.DelegateInvoke.vb b/src/Features/VisualBasic/Portable/SignatureHelp/InvocationExpressionSignatureHelpProvider.DelegateInvoke.vb
similarity index 97%
rename from src/EditorFeatures/VisualBasic/SignatureHelp/InvocationExpressionSignatureHelpProvider.DelegateInvoke.vb
rename to src/Features/VisualBasic/Portable/SignatureHelp/InvocationExpressionSignatureHelpProvider.DelegateInvoke.vb
index b1384943ed044112f753426c1dcd48fcc2830686..8e372f44c2290997dfba63aae69eead55277b4d4 100644
--- a/src/EditorFeatures/VisualBasic/SignatureHelp/InvocationExpressionSignatureHelpProvider.DelegateInvoke.vb
+++ b/src/Features/VisualBasic/Portable/SignatureHelp/InvocationExpressionSignatureHelpProvider.DelegateInvoke.vb
@@ -3,9 +3,10 @@
Imports System.Threading
Imports Microsoft.CodeAnalysis.DocumentationComments
Imports Microsoft.CodeAnalysis.LanguageServices
+Imports Microsoft.CodeAnalysis.SignatureHelp
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
-Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
+Namespace Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
Partial Friend Class InvocationExpressionSignatureHelpProvider
diff --git a/src/EditorFeatures/VisualBasic/SignatureHelp/InvocationExpressionSignatureHelpProvider.ElementAccess.vb b/src/Features/VisualBasic/Portable/SignatureHelp/InvocationExpressionSignatureHelpProvider.ElementAccess.vb
similarity index 95%
rename from src/EditorFeatures/VisualBasic/SignatureHelp/InvocationExpressionSignatureHelpProvider.ElementAccess.vb
rename to src/Features/VisualBasic/Portable/SignatureHelp/InvocationExpressionSignatureHelpProvider.ElementAccess.vb
index 002860792a2141d48ef5eac9d3562bb709bd50ad..c7e033d690e3e74f9f710102d6e4e50e4940dd40 100644
--- a/src/EditorFeatures/VisualBasic/SignatureHelp/InvocationExpressionSignatureHelpProvider.ElementAccess.vb
+++ b/src/Features/VisualBasic/Portable/SignatureHelp/InvocationExpressionSignatureHelpProvider.ElementAccess.vb
@@ -2,12 +2,11 @@
Imports System.Threading
Imports Microsoft.CodeAnalysis.DocumentationComments
-Imports Microsoft.CodeAnalysis.Editor.VisualBasic.DocumentationComments
-Imports Microsoft.CodeAnalysis.Editor.VisualBasic.Utilities
Imports Microsoft.CodeAnalysis.LanguageServices
+Imports Microsoft.CodeAnalysis.SignatureHelp
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
-Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
+Namespace Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
Partial Friend Class InvocationExpressionSignatureHelpProvider
diff --git a/src/EditorFeatures/VisualBasic/SignatureHelp/InvocationExpressionSignatureHelpProvider.MemberGroup.vb b/src/Features/VisualBasic/Portable/SignatureHelp/InvocationExpressionSignatureHelpProvider.MemberGroup.vb
similarity index 98%
rename from src/EditorFeatures/VisualBasic/SignatureHelp/InvocationExpressionSignatureHelpProvider.MemberGroup.vb
rename to src/Features/VisualBasic/Portable/SignatureHelp/InvocationExpressionSignatureHelpProvider.MemberGroup.vb
index d5e1f9b9bea31c2badcd044ca2a57d67fb9f9af2..7a5c5aabff328983284cdfc6b2920e0dc6e029ee 100644
--- a/src/EditorFeatures/VisualBasic/SignatureHelp/InvocationExpressionSignatureHelpProvider.MemberGroup.vb
+++ b/src/Features/VisualBasic/Portable/SignatureHelp/InvocationExpressionSignatureHelpProvider.MemberGroup.vb
@@ -1,12 +1,12 @@
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-Imports System.Runtime.CompilerServices
Imports System.Threading
Imports Microsoft.CodeAnalysis.DocumentationComments
Imports Microsoft.CodeAnalysis.LanguageServices
+Imports Microsoft.CodeAnalysis.SignatureHelp
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
-Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
+Namespace Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
Partial Friend Class InvocationExpressionSignatureHelpProvider
diff --git a/src/EditorFeatures/VisualBasic/SignatureHelp/InvocationExpressionSignatureHelpProvider.vb b/src/Features/VisualBasic/Portable/SignatureHelp/InvocationExpressionSignatureHelpProvider.vb
similarity index 97%
rename from src/EditorFeatures/VisualBasic/SignatureHelp/InvocationExpressionSignatureHelpProvider.vb
rename to src/Features/VisualBasic/Portable/SignatureHelp/InvocationExpressionSignatureHelpProvider.vb
index 745bddb7149b0a55bc0a8bf47ea4a2ba1f6f412e..79590b07468efc671a6c0b47d35c01d959cd3070 100644
--- a/src/EditorFeatures/VisualBasic/SignatureHelp/InvocationExpressionSignatureHelpProvider.vb
+++ b/src/Features/VisualBasic/Portable/SignatureHelp/InvocationExpressionSignatureHelpProvider.vb
@@ -1,17 +1,17 @@
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+Imports System.Composition
Imports System.Threading
-Imports System.Threading.Tasks
Imports Microsoft.CodeAnalysis.DocumentationComments
-Imports Microsoft.CodeAnalysis.Editor.SignatureHelp
Imports Microsoft.CodeAnalysis.LanguageServices
+Imports Microsoft.CodeAnalysis.SignatureHelp
Imports Microsoft.CodeAnalysis.Text
Imports Microsoft.CodeAnalysis.VisualBasic.Symbols
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
-Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
+Namespace Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
-
+
Partial Friend Class InvocationExpressionSignatureHelpProvider
Inherits AbstractVisualBasicSignatureHelpProvider
diff --git a/src/EditorFeatures/VisualBasic/SignatureHelp/MidAssignmentSignatureHelpProvider.vb b/src/Features/VisualBasic/Portable/SignatureHelp/MidAssignmentSignatureHelpProvider.vb
similarity index 90%
rename from src/EditorFeatures/VisualBasic/SignatureHelp/MidAssignmentSignatureHelpProvider.vb
rename to src/Features/VisualBasic/Portable/SignatureHelp/MidAssignmentSignatureHelpProvider.vb
index 23b7a9eb82804a5f11576cff01e49245d9d53ec0..084b2a3cefe19b4d9627d6bdf293b95a1471b622 100644
--- a/src/EditorFeatures/VisualBasic/SignatureHelp/MidAssignmentSignatureHelpProvider.vb
+++ b/src/Features/VisualBasic/Portable/SignatureHelp/MidAssignmentSignatureHelpProvider.vb
@@ -1,12 +1,14 @@
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+Imports System.Composition
Imports System.Threading
+Imports Microsoft.CodeAnalysis.SignatureHelp
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Imports Microsoft.CodeAnalysis.VisualBasic.Utilities.IntrinsicOperators
-Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
-
- Friend Partial Class MidAssignmentSignatureHelpProvider
+Namespace Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
+
+ Partial Friend Class MidAssignmentSignatureHelpProvider
Inherits AbstractIntrinsicOperatorSignatureHelpProvider(Of AssignmentStatementSyntax)
Protected Overrides Function GetIntrinsicOperatorDocumentation(node As AssignmentStatementSyntax, document As Document, cancellationToken As CancellationToken) As IEnumerable(Of AbstractIntrinsicOperatorDocumentation)
diff --git a/src/EditorFeatures/VisualBasic/SignatureHelp/NameOfExpressionSignatureHelpProvider.vb b/src/Features/VisualBasic/Portable/SignatureHelp/NameOfExpressionSignatureHelpProvider.vb
similarity index 89%
rename from src/EditorFeatures/VisualBasic/SignatureHelp/NameOfExpressionSignatureHelpProvider.vb
rename to src/Features/VisualBasic/Portable/SignatureHelp/NameOfExpressionSignatureHelpProvider.vb
index 4b65f613eedbc966f44284e3ec0788e4ac7f775d..f9f229b7780032f24e267dfad29ee50c05c166b8 100644
--- a/src/EditorFeatures/VisualBasic/SignatureHelp/NameOfExpressionSignatureHelpProvider.vb
+++ b/src/Features/VisualBasic/Portable/SignatureHelp/NameOfExpressionSignatureHelpProvider.vb
@@ -1,11 +1,13 @@
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+Imports System.Composition
Imports System.Threading
+Imports Microsoft.CodeAnalysis.SignatureHelp
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Imports Microsoft.CodeAnalysis.VisualBasic.Utilities.IntrinsicOperators
-Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
-
+Namespace Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
+
Friend Class NameOfExpressionSignatureHelpProvider
Inherits AbstractIntrinsicOperatorSignatureHelpProvider(Of NameOfExpressionSyntax)
diff --git a/src/EditorFeatures/VisualBasic/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider.DelegateType.vb b/src/Features/VisualBasic/Portable/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider.DelegateType.vb
similarity index 97%
rename from src/EditorFeatures/VisualBasic/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider.DelegateType.vb
rename to src/Features/VisualBasic/Portable/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider.DelegateType.vb
index d581708a355128a60a7e2a8b88b8df7fd30abfc0..1e837395bd302bf0b09555878dbcb56770e0a652 100644
--- a/src/EditorFeatures/VisualBasic/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider.DelegateType.vb
+++ b/src/Features/VisualBasic/Portable/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider.DelegateType.vb
@@ -3,9 +3,10 @@
Imports System.Threading
Imports Microsoft.CodeAnalysis.DocumentationComments
Imports Microsoft.CodeAnalysis.LanguageServices
+Imports Microsoft.CodeAnalysis.SignatureHelp
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
-Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
+Namespace Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
Partial Friend Class ObjectCreationExpressionSignatureHelpProvider
diff --git a/src/EditorFeatures/VisualBasic/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider.NormalType.vb b/src/Features/VisualBasic/Portable/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider.NormalType.vb
similarity index 97%
rename from src/EditorFeatures/VisualBasic/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider.NormalType.vb
rename to src/Features/VisualBasic/Portable/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider.NormalType.vb
index 1b135841c8861cbdd6ae83c253d3cdaddd3929c6..6eeda69e4980ac304780a6473ffd61d7bdc91362 100644
--- a/src/EditorFeatures/VisualBasic/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider.NormalType.vb
+++ b/src/Features/VisualBasic/Portable/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider.NormalType.vb
@@ -4,9 +4,10 @@ Imports System.Threading
Imports Microsoft.CodeAnalysis
Imports Microsoft.CodeAnalysis.DocumentationComments
Imports Microsoft.CodeAnalysis.LanguageServices
+Imports Microsoft.CodeAnalysis.SignatureHelp
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
-Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
+Namespace Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
Partial Friend Class ObjectCreationExpressionSignatureHelpProvider
diff --git a/src/EditorFeatures/VisualBasic/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider.vb b/src/Features/VisualBasic/Portable/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider.vb
similarity index 96%
rename from src/EditorFeatures/VisualBasic/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider.vb
rename to src/Features/VisualBasic/Portable/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider.vb
index efd5e9b18a1a393103f06826fe6a86eb0cbe8bb1..42d1ed2be515935537ee56eb40ed6968975d7589 100644
--- a/src/EditorFeatures/VisualBasic/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider.vb
+++ b/src/Features/VisualBasic/Portable/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider.vb
@@ -1,16 +1,16 @@
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+Imports System.Composition
Imports System.Threading
-Imports System.Threading.Tasks
Imports Microsoft.CodeAnalysis.DocumentationComments
-Imports Microsoft.CodeAnalysis.Editor.SignatureHelp
Imports Microsoft.CodeAnalysis.LanguageServices
+Imports Microsoft.CodeAnalysis.SignatureHelp
Imports Microsoft.CodeAnalysis.Text
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
-Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
+Namespace Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
-
+
Partial Friend Class ObjectCreationExpressionSignatureHelpProvider
Inherits AbstractVisualBasicSignatureHelpProvider
diff --git a/src/EditorFeatures/VisualBasic/SignatureHelp/PredefinedCastExpressionSignatureHelpProvider.vb b/src/Features/VisualBasic/Portable/SignatureHelp/PredefinedCastExpressionSignatureHelpProvider.vb
similarity index 87%
rename from src/EditorFeatures/VisualBasic/SignatureHelp/PredefinedCastExpressionSignatureHelpProvider.vb
rename to src/Features/VisualBasic/Portable/SignatureHelp/PredefinedCastExpressionSignatureHelpProvider.vb
index 6537ebc3603ac9f63ebc4b5fc170cc1ba046d7df..0c3ec68a0bec98069d9c6e3094118247fea6529a 100644
--- a/src/EditorFeatures/VisualBasic/SignatureHelp/PredefinedCastExpressionSignatureHelpProvider.vb
+++ b/src/Features/VisualBasic/Portable/SignatureHelp/PredefinedCastExpressionSignatureHelpProvider.vb
@@ -1,13 +1,14 @@
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-Imports System.ComponentModel.Composition
+Imports System.Composition
Imports System.Threading
+Imports Microsoft.CodeAnalysis.SignatureHelp
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Imports Microsoft.CodeAnalysis.VisualBasic.Utilities.IntrinsicOperators
-Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
-
- Friend Partial Class PredefinedCastExpressionSignatureHelpProvider
+Namespace Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
+
+ Partial Friend Class PredefinedCastExpressionSignatureHelpProvider
Inherits AbstractIntrinsicOperatorSignatureHelpProvider(Of PredefinedCastExpressionSyntax)
Protected Overrides Function GetIntrinsicOperatorDocumentation(node As PredefinedCastExpressionSyntax, document As Document, cancellationToken As CancellationToken) As IEnumerable(Of AbstractIntrinsicOperatorDocumentation)
diff --git a/src/EditorFeatures/VisualBasic/SignatureHelp/RaiseEventStatementSignatureHelpProvider.vb b/src/Features/VisualBasic/Portable/SignatureHelp/RaiseEventStatementSignatureHelpProvider.vb
similarity index 97%
rename from src/EditorFeatures/VisualBasic/SignatureHelp/RaiseEventStatementSignatureHelpProvider.vb
rename to src/Features/VisualBasic/Portable/SignatureHelp/RaiseEventStatementSignatureHelpProvider.vb
index e06a703f7156fe1597de2d12a2d38df5f5a0942e..7f1a40a3e2d96df683116eb826be0305624705e0 100644
--- a/src/EditorFeatures/VisualBasic/SignatureHelp/RaiseEventStatementSignatureHelpProvider.vb
+++ b/src/Features/VisualBasic/Portable/SignatureHelp/RaiseEventStatementSignatureHelpProvider.vb
@@ -1,15 +1,15 @@
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+Imports System.Composition
Imports System.Threading
-Imports System.Threading.Tasks
Imports Microsoft.CodeAnalysis.DocumentationComments
-Imports Microsoft.CodeAnalysis.Editor.SignatureHelp
Imports Microsoft.CodeAnalysis.LanguageServices
+Imports Microsoft.CodeAnalysis.SignatureHelp
Imports Microsoft.CodeAnalysis.Text
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
-Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
-
+Namespace Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
+
Friend Class RaiseEventStatementSignatureHelpProvider
Inherits AbstractVisualBasicSignatureHelpProvider
diff --git a/src/EditorFeatures/VisualBasic/SignatureHelp/SignatureHelpUtilities.vb b/src/Features/VisualBasic/Portable/SignatureHelp/SignatureHelpUtilities.vb
similarity index 97%
rename from src/EditorFeatures/VisualBasic/SignatureHelp/SignatureHelpUtilities.vb
rename to src/Features/VisualBasic/Portable/SignatureHelp/SignatureHelpUtilities.vb
index a05fdba4f13e1348bc9ca802222d80b4208eebbd..1bf933f1f791aed5dc08f2cfcad4efe2bbb37f2e 100644
--- a/src/EditorFeatures/VisualBasic/SignatureHelp/SignatureHelpUtilities.vb
+++ b/src/Features/VisualBasic/Portable/SignatureHelp/SignatureHelpUtilities.vb
@@ -1,10 +1,10 @@
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-Imports Microsoft.CodeAnalysis.Editor.SignatureHelp
+Imports Microsoft.CodeAnalysis.SignatureHelp
Imports Microsoft.CodeAnalysis.Text
Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
-Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.SignatureHelp
+Namespace Microsoft.CodeAnalysis.VisualBasic.SignatureHelp
Friend Module SignatureHelpUtilities
Private ReadOnly s_getArgumentListOpenToken As Func(Of ArgumentListSyntax, SyntaxToken) = Function(list) list.OpenParenToken
diff --git a/src/Features/VisualBasic/Portable/VBFeaturesResources.Designer.vb b/src/Features/VisualBasic/Portable/VBFeaturesResources.Designer.vb
index c91ef77f3b6c5750cf84481376f47dd9872c769b..8dbdac11faba890281f126619021f5dd0e965fac 100644
--- a/src/Features/VisualBasic/Portable/VBFeaturesResources.Designer.vb
+++ b/src/Features/VisualBasic/Portable/VBFeaturesResources.Designer.vb
@@ -2303,6 +2303,15 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.VBFeaturesResources
End Get
End Property
+ '''
+ ''' Looks up a localized string similar to Properties.
+ '''
+ Friend ReadOnly Property Properties() As String
+ Get
+ Return ResourceManager.GetString("Properties", resourceCulture)
+ End Get
+ End Property
+
'''
''' Looks up a localized string similar to property accessor.
'''
diff --git a/src/Features/VisualBasic/Portable/VBFeaturesResources.resx b/src/Features/VisualBasic/Portable/VBFeaturesResources.resx
index 6334ee68d26f891f8cf243379b3b44c96ab916e3..364e5d89877e5ba442e7b7172ddbd491ef29edda 100644
--- a/src/Features/VisualBasic/Portable/VBFeaturesResources.resx
+++ b/src/Features/VisualBasic/Portable/VBFeaturesResources.resx
@@ -1201,4 +1201,7 @@ Sub(<parameterList>) <statement>
Add a metadata reference to specified assembly and all its dependencies, e.g. #r "myLib.dll".
+
+ Properties
+
\ No newline at end of file
diff --git a/src/VisualStudio/Core/Test/DebuggerIntelliSense/TestState.vb b/src/VisualStudio/Core/Test/DebuggerIntelliSense/TestState.vb
index c9cc45a6d13304c65f9563121b388894e4f3980b..70c30b08a44a386dcf4440a29d5221e69bde0598 100644
--- a/src/VisualStudio/Core/Test/DebuggerIntelliSense/TestState.vb
+++ b/src/VisualStudio/Core/Test/DebuggerIntelliSense/TestState.vb
@@ -14,6 +14,7 @@ Imports Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense
Imports Microsoft.CodeAnalysis.Host.Mef
Imports Microsoft.CodeAnalysis.Shared.Extensions
Imports Microsoft.CodeAnalysis.Shared.TestHooks
+Imports Microsoft.CodeAnalysis.SignatureHelp
Imports Microsoft.CodeAnalysis.Text.Shared.Extensions
Imports Microsoft.VisualStudio.LanguageServices.CSharp.LanguageService
Imports Microsoft.VisualStudio.LanguageServices.Implementation.DebuggerIntelliSense