From 6dea71b02c6acfabbd28db1a47b2e4c66f3d5217 Mon Sep 17 00:00:00 2001 From: Bart Koelman Date: Thu, 5 May 2016 01:38:13 +0200 Subject: [PATCH 1/3] Use nameof() instead of string literals in ArgumentExceptions --- .../SignatureDecoder.cs | 2 +- .../MetadataAsSourceFileService.cs | 2 +- .../SymbolMappingServiceFactory.cs | 4 +--- .../SmartIndent/SmartIndentProvider.cs | 2 +- .../ChangeSignature/ChangeSignatureTestState.cs | 2 +- .../ExtractInterface/ExtractInterfaceTestState.cs | 2 +- .../Test/RenameTracking/RenameTrackingTestState.cs | 2 +- .../Portable/CodeRefactorings/CodeRefactoring.cs | 2 +- .../Shared/Extensions/ISymbolExtensions_2.cs | 4 ++-- .../Editor/TextTransactionMergePolicy.cs | 14 +++++++++----- .../CSharpProjectShim.ICSInputSet.cs | 2 +- .../CSharpProjectShim.ICSharpProjectSite.cs | 2 +- .../Test/CodeModel/AbstractFileCodeElementTests.cs | 2 +- .../Core/Def/Implementation/Interop/ComHandle.cs | 2 +- .../Implementation/ProjectSystem/ComEventSink.cs | 2 +- .../ProjectSystem/VisualStudioProjectTracker.cs | 4 ++-- .../TaskList/ProjectExternalErrorReporter.cs | 2 +- .../Venus/ContainedLanguageCodeSupport.cs | 2 +- .../Impl/CodeModel/AbstractCodeModelService.cs | 2 +- .../Portable/CodeGeneration/OperatorGenerator.cs | 2 +- .../Portable/Extensions/SyntaxTreeExtensions.cs | 2 +- .../Simplification/CSharpSimplificationService.cs | 4 +--- .../Portable/Utilities/NameSyntaxIterator.cs | 2 +- .../CodeGeneration/CodeGenerationSymbolFactory.cs | 2 +- 24 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/Debugging/Roslyn.Reflection.Metadata.Decoding/SignatureDecoder.cs b/src/Debugging/Roslyn.Reflection.Metadata.Decoding/SignatureDecoder.cs index 188be0e694521..7e85681ef62df 100644 --- a/src/Debugging/Roslyn.Reflection.Metadata.Decoding/SignatureDecoder.cs +++ b/src/Debugging/Roslyn.Reflection.Metadata.Decoding/SignatureDecoder.cs @@ -46,7 +46,7 @@ internal struct SignatureDecoder { if (provider == null) { - throw new ArgumentNullException("provider"); + throw new ArgumentNullException(nameof(provider)); } _metadataReaderOpt = metadataReader; diff --git a/src/EditorFeatures/Core/Implementation/MetadataAsSource/MetadataAsSourceFileService.cs b/src/EditorFeatures/Core/Implementation/MetadataAsSource/MetadataAsSourceFileService.cs index 6f89c145c6e47..f3cf6f1ae0c0d 100644 --- a/src/EditorFeatures/Core/Implementation/MetadataAsSource/MetadataAsSourceFileService.cs +++ b/src/EditorFeatures/Core/Implementation/MetadataAsSource/MetadataAsSourceFileService.cs @@ -80,7 +80,7 @@ public async Task GetGeneratedFileAsync(Project project, I if (symbol.Kind == SymbolKind.Namespace) { - throw new ArgumentException(EditorFeaturesResources.SymbolCannotBeNamespace, "symbol"); + throw new ArgumentException(EditorFeaturesResources.SymbolCannotBeNamespace, nameof(symbol)); } symbol = symbol.GetOriginalUnreducedDefinition(); diff --git a/src/EditorFeatures/Core/Implementation/MetadataAsSource/SymbolMappingServiceFactory.cs b/src/EditorFeatures/Core/Implementation/MetadataAsSource/SymbolMappingServiceFactory.cs index 468bd7be1818a..01a244ec80b8b 100644 --- a/src/EditorFeatures/Core/Implementation/MetadataAsSource/SymbolMappingServiceFactory.cs +++ b/src/EditorFeatures/Core/Implementation/MetadataAsSource/SymbolMappingServiceFactory.cs @@ -26,9 +26,7 @@ public Task MapSymbolAsync(Document document, SymbolKey sym var workspace = document.Project.Solution.Workspace as MetadataAsSourceWorkspace; if (workspace == null) { - throw new ArgumentException( - EditorFeaturesResources.DocumentMustBeContainedInWorkspace, - "document"); + throw new ArgumentException(EditorFeaturesResources.DocumentMustBeContainedInWorkspace, nameof(document)); } return workspace.FileService.MapSymbolAsync(document, symbolId, cancellationToken); diff --git a/src/EditorFeatures/Core/Implementation/SmartIndent/SmartIndentProvider.cs b/src/EditorFeatures/Core/Implementation/SmartIndent/SmartIndentProvider.cs index dfb44fe0bdf37..fa5e3082c17dc 100644 --- a/src/EditorFeatures/Core/Implementation/SmartIndent/SmartIndentProvider.cs +++ b/src/EditorFeatures/Core/Implementation/SmartIndent/SmartIndentProvider.cs @@ -17,7 +17,7 @@ public ISmartIndent CreateSmartIndent(ITextView textView) { if (textView == null) { - throw new ArgumentNullException(@"textView"); + throw new ArgumentNullException(nameof(textView)); } if (!textView.TextBuffer.GetOption(InternalFeatureOnOffOptions.SmartIndenter)) diff --git a/src/EditorFeatures/Test/ChangeSignature/ChangeSignatureTestState.cs b/src/EditorFeatures/Test/ChangeSignature/ChangeSignatureTestState.cs index cb00b46430b8c..47707d806e307 100644 --- a/src/EditorFeatures/Test/ChangeSignature/ChangeSignatureTestState.cs +++ b/src/EditorFeatures/Test/ChangeSignature/ChangeSignatureTestState.cs @@ -49,7 +49,7 @@ public ChangeSignatureTestState(TestWorkspace workspace) if (_testDocument == null) { - throw new ArgumentException("markup does not contain a cursor position", "workspace"); + throw new ArgumentException("markup does not contain a cursor position", nameof(workspace)); } InvocationDocument = Workspace.CurrentSolution.GetDocument(_testDocument.Id); diff --git a/src/EditorFeatures/Test/ExtractInterface/ExtractInterfaceTestState.cs b/src/EditorFeatures/Test/ExtractInterface/ExtractInterfaceTestState.cs index ea119aa9dc6e0..23d2e12eb81e7 100644 --- a/src/EditorFeatures/Test/ExtractInterface/ExtractInterfaceTestState.cs +++ b/src/EditorFeatures/Test/ExtractInterface/ExtractInterfaceTestState.cs @@ -46,7 +46,7 @@ public ExtractInterfaceTestState(TestWorkspace workspace) if (_testDocument == null) { - throw new ArgumentException("markup does not contain a cursor position", "workspace"); + throw new ArgumentException("markup does not contain a cursor position", nameof(workspace)); } ExtractFromDocument = Workspace.CurrentSolution.GetDocument(_testDocument.Id); diff --git a/src/EditorFeatures/Test/RenameTracking/RenameTrackingTestState.cs b/src/EditorFeatures/Test/RenameTracking/RenameTrackingTestState.cs index 90efa98f9128c..a2c5b3137c2f2 100644 --- a/src/EditorFeatures/Test/RenameTracking/RenameTrackingTestState.cs +++ b/src/EditorFeatures/Test/RenameTracking/RenameTrackingTestState.cs @@ -112,7 +112,7 @@ internal sealed class RenameTrackingTestState : IDisposable } else { - throw new ArgumentException("Invalid language name: " + languageName, "languageName"); + throw new ArgumentException("Invalid language name: " + languageName, nameof(languageName)); } } diff --git a/src/Features/Core/Portable/CodeRefactorings/CodeRefactoring.cs b/src/Features/Core/Portable/CodeRefactorings/CodeRefactoring.cs index d2e2e2163d7a5..cbe2a9860f51d 100644 --- a/src/Features/Core/Portable/CodeRefactorings/CodeRefactoring.cs +++ b/src/Features/Core/Portable/CodeRefactorings/CodeRefactoring.cs @@ -35,7 +35,7 @@ public CodeRefactoring(CodeRefactoringProvider provider, IEnumerable if (_actions.Count == 0) { - throw new ArgumentException(FeaturesResources.ActionsCanNotBeEmpty, "actions"); + throw new ArgumentException(FeaturesResources.ActionsCanNotBeEmpty, nameof(actions)); } } } diff --git a/src/Features/Core/Portable/Shared/Extensions/ISymbolExtensions_2.cs b/src/Features/Core/Portable/Shared/Extensions/ISymbolExtensions_2.cs index 9d8faa3ea2d9f..62defa7790728 100644 --- a/src/Features/Core/Portable/Shared/Extensions/ISymbolExtensions_2.cs +++ b/src/Features/Core/Portable/Shared/Extensions/ISymbolExtensions_2.cs @@ -81,7 +81,7 @@ public static Glyph GetGlyph(this ISymbol symbol) return Glyph.Error; default: - throw new ArgumentException(FeaturesResources.TheSymbolDoesNotHaveAnIcon, "symbol"); + throw new ArgumentException(FeaturesResources.TheSymbolDoesNotHaveAnIcon, nameof(symbol)); } break; @@ -144,7 +144,7 @@ public static Glyph GetGlyph(this ISymbol symbol) return Glyph.TypeParameter; default: - throw new ArgumentException(FeaturesResources.TheSymbolDoesNotHaveAnIcon, "symbol"); + throw new ArgumentException(FeaturesResources.TheSymbolDoesNotHaveAnIcon, nameof(symbol)); } switch (symbol.DeclaredAccessibility) diff --git a/src/InteractiveWindow/Editor/TextTransactionMergePolicy.cs b/src/InteractiveWindow/Editor/TextTransactionMergePolicy.cs index c17aa1fdf465d..e5c72a43e39fb 100644 --- a/src/InteractiveWindow/Editor/TextTransactionMergePolicy.cs +++ b/src/InteractiveWindow/Editor/TextTransactionMergePolicy.cs @@ -36,12 +36,12 @@ public bool CanMerge(ITextUndoTransaction newTransaction, ITextUndoTransaction o // Validate if (newTransaction == null) { - throw new ArgumentNullException("newTransaction"); + throw new ArgumentNullException(nameof(newTransaction)); } if (oldTransaction == null) { - throw new ArgumentNullException("oldTransaction"); + throw new ArgumentNullException(nameof(oldTransaction)); } TextTransactionMergePolicy oldPolicy = oldTransaction.MergePolicy as TextTransactionMergePolicy; @@ -70,9 +70,13 @@ public bool CanMerge(ITextUndoTransaction newTransaction, ITextUndoTransaction o public void PerformTransactionMerge(ITextUndoTransaction existingTransaction, ITextUndoTransaction newTransaction) { if (existingTransaction == null) - throw new ArgumentNullException("existingTransaction"); + { + throw new ArgumentNullException(nameof(existingTransaction)); + } if (newTransaction == null) - throw new ArgumentNullException("newTransaction"); + { + throw new ArgumentNullException(nameof(newTransaction)); + } // Remove trailing AfterTextBufferChangeUndoPrimitive from previous transaction and skip copying // initial BeforeTextBufferChangeUndoPrimitive from newTransaction, as they are unnecessary. @@ -89,7 +93,7 @@ public bool TestCompatiblePolicy(IMergeTextUndoTransactionPolicy other) { if (other == null) { - throw new ArgumentNullException("other"); + throw new ArgumentNullException(nameof(other)); } // Only merge transaction if they are both a text transaction diff --git a/src/VisualStudio/CSharp/Impl/ProjectSystemShim/CSharpProjectShim.ICSInputSet.cs b/src/VisualStudio/CSharp/Impl/ProjectSystemShim/CSharpProjectShim.ICSInputSet.cs index e2db9726224ad..583eb19cea74f 100644 --- a/src/VisualStudio/CSharp/Impl/ProjectSystemShim/CSharpProjectShim.ICSInputSet.cs +++ b/src/VisualStudio/CSharp/Impl/ProjectSystemShim/CSharpProjectShim.ICSInputSet.cs @@ -79,7 +79,7 @@ public void SetOutputFileType(OutputFileType fileType) default: - throw new ArgumentException("fileType was not a valid OutputFileType", "fileType"); + throw new ArgumentException("fileType was not a valid OutputFileType", nameof(fileType)); } SetOption(ref _outputKind, newOutputKind); diff --git a/src/VisualStudio/CSharp/Impl/ProjectSystemShim/CSharpProjectShim.ICSharpProjectSite.cs b/src/VisualStudio/CSharp/Impl/ProjectSystemShim/CSharpProjectShim.ICSharpProjectSite.cs index be31af1b191bd..fdd1cc11845f2 100644 --- a/src/VisualStudio/CSharp/Impl/ProjectSystemShim/CSharpProjectShim.ICSharpProjectSite.cs +++ b/src/VisualStudio/CSharp/Impl/ProjectSystemShim/CSharpProjectShim.ICSharpProjectSite.cs @@ -116,7 +116,7 @@ public int OnImportAddedEx(string filename, string project, CompilerOptions opti if (optionID != CompilerOptions.OPTID_IMPORTS && optionID != CompilerOptions.OPTID_IMPORTSUSINGNOPIA) { - throw new ArgumentException("optionID was an unexpected value.", "optionID"); + throw new ArgumentException("optionID was an unexpected value.", nameof(optionID)); } bool embedInteropTypes = optionID == CompilerOptions.OPTID_IMPORTSUSINGNOPIA; diff --git a/src/VisualStudio/CSharp/Test/CodeModel/AbstractFileCodeElementTests.cs b/src/VisualStudio/CSharp/Test/CodeModel/AbstractFileCodeElementTests.cs index f802ec9ee5ea6..dd6e3301c6480 100644 --- a/src/VisualStudio/CSharp/Test/CodeModel/AbstractFileCodeElementTests.cs +++ b/src/VisualStudio/CSharp/Test/CodeModel/AbstractFileCodeElementTests.cs @@ -60,7 +60,7 @@ protected async Task GetCodeElementAsync(params object[] path) if (path.Length == 0) { - throw new ArgumentException("path must be non-empty.", "path"); + throw new ArgumentException("path must be non-empty.", nameof(path)); } CodeElement codeElement = (await GetCodeModelAsync()).CodeElements.Item(path[0]); diff --git a/src/VisualStudio/Core/Def/Implementation/Interop/ComHandle.cs b/src/VisualStudio/Core/Def/Implementation/Interop/ComHandle.cs index dc9b6a84cd5c5..d58935e1bbd3a 100644 --- a/src/VisualStudio/Core/Def/Implementation/Interop/ComHandle.cs +++ b/src/VisualStudio/Core/Def/Implementation/Interop/ComHandle.cs @@ -54,7 +54,7 @@ public ComHandle(THandle handle, TObject managedObject) // case. if (handle != null && !Marshal.IsComObject(handle)) { - throw new ArgumentException("must be null or a Com object", "handle"); + throw new ArgumentException("must be null or a Com object", nameof(handle)); } _handle = handle; diff --git a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/ComEventSink.cs b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/ComEventSink.cs index db6dab4b37e1b..44f480e247783 100644 --- a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/ComEventSink.cs +++ b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/ComEventSink.cs @@ -17,7 +17,7 @@ internal static class ComEventSink var connectionPointContainer = obj as IConnectionPointContainer; if (connectionPointContainer == null) { - throw new ArgumentException("Not an IConnectionPointContainer", "obj"); + throw new ArgumentException("Not an IConnectionPointContainer", nameof(obj)); } IConnectionPoint connectionPoint; diff --git a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioProjectTracker.cs b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioProjectTracker.cs index 7ae2a4ffe0d4b..205b450f86b2a 100644 --- a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioProjectTracker.cs +++ b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioProjectTracker.cs @@ -139,7 +139,7 @@ public void RegisterWorkspaceHost(IVisualStudioWorkspaceHost host) { if (_workspaceHosts.Any(hostState => hostState.Host == host)) { - throw new ArgumentException("The workspace host is already registered.", "host"); + throw new ArgumentException("The workspace host is already registered.", nameof(host)); } _workspaceHosts.Add(new WorkspaceHostState(this, host)); @@ -150,7 +150,7 @@ public void StartSendingEventsToWorkspaceHost(IVisualStudioWorkspaceHost host) var hostData = _workspaceHosts.Find(s => s.Host == host); if (hostData == null) { - throw new ArgumentException("The workspace host not registered", "host"); + throw new ArgumentException("The workspace host not registered", nameof(host)); } // This method is idempotent. diff --git a/src/VisualStudio/Core/Def/Implementation/TaskList/ProjectExternalErrorReporter.cs b/src/VisualStudio/Core/Def/Implementation/TaskList/ProjectExternalErrorReporter.cs index 40d9499be3ec5..01e4d6816d309 100644 --- a/src/VisualStudio/Core/Def/Implementation/TaskList/ProjectExternalErrorReporter.cs +++ b/src/VisualStudio/Core/Def/Implementation/TaskList/ProjectExternalErrorReporter.cs @@ -170,7 +170,7 @@ public void ReportError2(string bstrErrorMessage, string bstrErrorId, [ComAliasN severity = DiagnosticSeverity.Info; break; default: - throw new ArgumentException(ServicesVSResources.NotAValidValue, "nPriority"); + throw new ArgumentException(ServicesVSResources.NotAValidValue, nameof(nPriority)); } var diagnostic = GetDiagnosticData( diff --git a/src/VisualStudio/Core/Def/Implementation/Venus/ContainedLanguageCodeSupport.cs b/src/VisualStudio/Core/Def/Implementation/Venus/ContainedLanguageCodeSupport.cs index 22cca2be250ce..ab0123462a47c 100644 --- a/src/VisualStudio/Core/Def/Implementation/Venus/ContainedLanguageCodeSupport.cs +++ b/src/VisualStudio/Core/Def/Implementation/Venus/ContainedLanguageCodeSupport.cs @@ -389,7 +389,7 @@ private static bool IncludeMember(ISymbol member, CODEMEMBERTYPE memberType, Com return member.Kind == SymbolKind.Method; default: - throw new ArgumentException("InvalidValue", "memberType"); + throw new ArgumentException("InvalidValue", nameof(memberType)); } } diff --git a/src/VisualStudio/Core/Impl/CodeModel/AbstractCodeModelService.cs b/src/VisualStudio/Core/Impl/CodeModel/AbstractCodeModelService.cs index 734e4a1c4e953..b3f9132ce091a 100644 --- a/src/VisualStudio/Core/Impl/CodeModel/AbstractCodeModelService.cs +++ b/src/VisualStudio/Core/Impl/CodeModel/AbstractCodeModelService.cs @@ -833,7 +833,7 @@ public Accessibility GetAccessibility(EnvDTE.vsCMAccess access, SymbolKind targe } else { - throw new ArgumentException(ServicesVSResources.InvalidAccess, "access"); + throw new ArgumentException(ServicesVSResources.InvalidAccess, nameof(access)); } } diff --git a/src/Workspaces/CSharp/Portable/CodeGeneration/OperatorGenerator.cs b/src/Workspaces/CSharp/Portable/CodeGeneration/OperatorGenerator.cs index 387df8168ba9b..6ff31b5c35335 100644 --- a/src/Workspaces/CSharp/Portable/CodeGeneration/OperatorGenerator.cs +++ b/src/Workspaces/CSharp/Portable/CodeGeneration/OperatorGenerator.cs @@ -53,7 +53,7 @@ internal static class OperatorGenerator var operatorSyntaxKind = SyntaxFacts.GetOperatorKind(method.MetadataName); if (operatorSyntaxKind == SyntaxKind.None) { - throw new ArgumentException(string.Format(WorkspacesResources.CannotCodeGenUnsupportedOperator, method.Name), "method"); + throw new ArgumentException(string.Format(WorkspacesResources.CannotCodeGenUnsupportedOperator, method.Name), nameof(method)); } var operatorToken = SyntaxFactory.Token(operatorSyntaxKind); diff --git a/src/Workspaces/CSharp/Portable/Extensions/SyntaxTreeExtensions.cs b/src/Workspaces/CSharp/Portable/Extensions/SyntaxTreeExtensions.cs index f4fa9337362f4..e62c62319ba8d 100644 --- a/src/Workspaces/CSharp/Portable/Extensions/SyntaxTreeExtensions.cs +++ b/src/Workspaces/CSharp/Portable/Extensions/SyntaxTreeExtensions.cs @@ -356,7 +356,7 @@ private static bool AtEndOfIncompleteStringOrCharLiteral(SyntaxToken token, int { if (!token.IsKind(SyntaxKind.StringLiteralToken, SyntaxKind.CharacterLiteralToken)) { - throw new ArgumentException(CSharpWorkspaceResources.ExpectedStringOrCharLiteral, "token"); + throw new ArgumentException(CSharpWorkspaceResources.ExpectedStringOrCharLiteral, nameof(token)); } int startLength = 1; diff --git a/src/Workspaces/CSharp/Portable/Simplification/CSharpSimplificationService.cs b/src/Workspaces/CSharp/Portable/Simplification/CSharpSimplificationService.cs index eae2165b21373..a7f588eb36557 100644 --- a/src/Workspaces/CSharp/Portable/Simplification/CSharpSimplificationService.cs +++ b/src/Workspaces/CSharp/Portable/Simplification/CSharpSimplificationService.cs @@ -51,9 +51,7 @@ public override SyntaxNode Expand(SyntaxNode node, SemanticModel semanticModel, } else { - throw new ArgumentException( - CSharpWorkspaceResources.OnlyAttributesConstructorI, - paramName: "node"); + throw new ArgumentException(CSharpWorkspaceResources.OnlyAttributesConstructorI, nameof(node)); } } } diff --git a/src/Workspaces/CSharp/Portable/Utilities/NameSyntaxIterator.cs b/src/Workspaces/CSharp/Portable/Utilities/NameSyntaxIterator.cs index 03cf0759e491c..0f9f863bb6a2f 100644 --- a/src/Workspaces/CSharp/Portable/Utilities/NameSyntaxIterator.cs +++ b/src/Workspaces/CSharp/Portable/Utilities/NameSyntaxIterator.cs @@ -17,7 +17,7 @@ public NameSyntaxIterator(NameSyntax name) { if (name == null) { - throw new ArgumentNullException(@"name"); + throw new ArgumentNullException(nameof(name)); } _name = name; diff --git a/src/Workspaces/Core/Portable/CodeGeneration/CodeGenerationSymbolFactory.cs b/src/Workspaces/Core/Portable/CodeGeneration/CodeGenerationSymbolFactory.cs index c8948704be50c..f2ce866ce18d4 100644 --- a/src/Workspaces/Core/Portable/CodeGeneration/CodeGenerationSymbolFactory.cs +++ b/src/Workspaces/Core/Portable/CodeGeneration/CodeGenerationSymbolFactory.cs @@ -142,7 +142,7 @@ public static IMethodSymbol CreateOperatorSymbol(IList attributes var message = expectedParameterCount == 1 ? WorkspacesResources.InvalidParameterCountForUnaryOperator : WorkspacesResources.InvalidParameterCountForBinaryOperator; - throw new ArgumentException(message, "parameters"); + throw new ArgumentException(message, nameof(parameters)); } var result = new CodeGenerationOperatorSymbol(null, attributes, accessibility, modifiers, returnType, operatorKind, parameters, returnTypeAttributes); From 6a3b9fd14a63fd962a88109a4b62ae316ff0c6e9 Mon Sep 17 00:00:00 2001 From: Dustin Campbell Date: Thu, 5 May 2016 10:08:29 -0700 Subject: [PATCH 2/3] Move Signature Help to features layer --- .../CSharp/CSharpEditorFeatures.csproj | 15 ------------ .../CSharp/CSharpEditorResources.Designer.cs | 9 ------- .../CSharp/CSharpEditorResources.resx | 3 --- .../AttributeSignatureHelpProviderTests.cs | 18 +++++++------- ...orInitializerSignatureHelpProviderTests.cs | 3 ++- ...essExpressionSignatureHelpProviderTests.cs | 3 ++- ...tiallyWrittenSignatureHelpProviderTests.cs | 7 +++--- .../GenericNameSignatureHelpProviderTests.cs | 7 +++--- ...ionExpressionSignatureHelpProviderTests.cs | 9 +++---- ...ionExpressionSignatureHelpProviderTests.cs | 3 ++- .../SignatureHelpCommandHandler.cs | 1 + src/EditorFeatures/Core/EditorFeatures.csproj | 11 --------- .../Core/EditorFeaturesResources.Designer.cs | 9 ------- .../Core/EditorFeaturesResources.resx | 3 --- .../ISignatureHelpPresenterSession.cs | 1 + .../SignatureHelpItemEventArgs.cs | 1 + .../Controller.Session_ComputeModel.cs | 1 + ...Controller.Session_SetModelSelectedItem.cs | 1 + .../Controller.Session_UpdateModel.cs | 1 + .../IntelliSense/SignatureHelp/Controller.cs | 1 + .../Controller_InvokeSignatureHelp.cs | 1 + .../SignatureHelp/Controller_TypeChar.cs | 1 + .../IntelliSense/SignatureHelp/Model.cs | 1 + .../SignatureHelp/Presentation/Parameter.cs | 1 + .../SignatureHelp/Presentation/Signature.cs | 5 ++-- ...Presenter.SignatureHelpPresenterSession.cs | 1 + .../AbstractSignatureHelpProviderTests.cs | 4 +--- .../SignatureHelpControllerTests.vb | 1 + .../TestSignatureHelpPresenterSession.vb | 1 + .../Test2/IntelliSense/TestState.vb | 1 + .../VisualBasic/BasicEditorFeatures.vbproj | 24 ------------------- .../VisualBasic/VBEditorResources.Designer.vb | 11 +-------- .../VisualBasic/VBEditorResources.resx | 3 --- ...ctVisualBasicSignatureHelpProviderTests.vb | 2 -- ...RemoveHandlerSignatureHelpProviderTests.vb | 4 ++-- .../AttributeSignatureHelpProviderTests.vb | 5 ++-- ...astExpressionSignatureHelpProviderTests.vb | 4 ++-- ...nalExpressionSignatureHelpProviderTests.vb | 4 ++-- ...onAggregationSignatureHelpProviderTests.vb | 4 ++-- .../GenericNameSignatureHelpProviderTests.vb | 4 ++-- ...ypeExpressionSignatureHelpProviderTests.vb | 4 ++-- ...aceExpressionSignatureHelpProviderTests.vb | 4 ++-- ...ionExpressionSignatureHelpProviderTests.vb | 4 ++-- ...MidAssignmentSignatureHelpProviderTests.vb | 4 ++-- ...ionExpressionSignatureHelpProviderTests.vb | 5 ++-- ...astExpressionSignatureHelpProviderTests.vb | 4 ++-- ...ventStatementSignatureHelpProviderTests.vb | 5 ++-- .../CSharp/Portable/CSharpFeatures.csproj | 15 ++++++++++++ .../CSharpFeaturesResources.Designer.cs | 15 +++++++++--- .../Portable/CSharpFeaturesResources.resx | 5 +++- .../AbstractCSharpSignatureHelpProvider.cs | 5 ++-- .../AttributeSignatureHelpProvider.cs | 10 ++++---- ...tructorInitializerSignatureHelpProvider.cs | 8 +++---- ...ntAccessExpressionSignatureHelpProvider.cs | 8 +++---- ...mePartiallyWrittenSignatureHelpProvider.cs | 7 +++--- .../GenericNameSignatureHelpProvider.cs | 8 +++---- ...GenericNameSignatureHelpProvider_Method.cs | 3 +-- ...ericNameSignatureHelpProvider_NamedType.cs | 3 +-- ...vocationExpressionSignatureHelpProvider.cs | 8 +++---- ...ionSignatureHelpProvider_DelegateInvoke.cs | 4 ++-- ...essionSignatureHelpProvider_MethodGroup.cs | 4 ++-- ...CreationExpressionSignatureHelpProvider.cs | 8 +++---- ...ssionSignatureHelpProvider_DelegateType.cs | 4 ++-- ...ressionSignatureHelpProvider_NormalType.cs | 4 ++-- .../SignatureHelp/SignatureHelpUtilities.cs | 8 ++----- src/Features/Core/Portable/Features.csproj | 11 +++++++++ .../Portable/FeaturesResources.Designer.cs | 9 +++++++ .../Core/Portable/FeaturesResources.resx | 3 +++ ...HelpProvider.SymbolKeySignatureHelpItem.cs | 2 +- .../AbstractSignatureHelpProvider.cs | 2 +- .../CommonSignatureHelpUtilities.cs | 2 +- .../ExportSignatureHelpProviderAttribute.cs | 4 ++-- .../SignatureHelp/ISignatureHelpProvider.cs | 2 +- .../SignatureHelp/SignatureHelpItem.cs | 4 ++-- .../SignatureHelp/SignatureHelpItems.cs | 2 +- .../SignatureHelp/SignatureHelpParameter.cs | 2 +- .../SignatureHelp/SignatureHelpState.cs | 2 +- .../SignatureHelp/SignatureHelpTriggerInfo.cs | 2 +- .../SignatureHelpTriggerReason.cs | 2 +- .../VisualBasic/Portable/BasicFeatures.vbproj | 24 +++++++++++++++++++ ...tIntrinsicOperatorSignatureHelpProvider.vb | 5 ++-- .../AbstractSignatureHelpProvider.vb | 4 ++-- .../AddRemoveHandlerSignatureHelpProvider.vb | 6 +++-- .../AttributeSignatureHelpProvider.vb | 10 ++++---- .../CastExpressionSignatureHelpProvider.vb | 8 ++++--- ...ditionalExpressionSignatureHelpProvider.vb | 8 ++++--- ...unctionAggregationSignatureHelpProvider.vb | 8 +++---- ...GenericNameSignatureHelpProvider.Method.vb | 2 +- ...ericNameSignatureHelpProvider.NamedType.vb | 2 +- .../GenericNameSignatureHelpProvider.vb | 8 +++---- .../GetTypeExpressionSignatureHelpProvider.vb | 8 ++++--- ...amespaceExpressionSignatureHelpProvider.vb | 8 ++++--- ...ionSignatureHelpProvider.DelegateInvoke.vb | 3 ++- ...sionSignatureHelpProvider.ElementAccess.vb | 5 ++-- ...essionSignatureHelpProvider.MemberGroup.vb | 4 ++-- ...vocationExpressionSignatureHelpProvider.vb | 8 +++---- .../MidAssignmentSignatureHelpProvider.vb | 8 ++++--- .../NameOfExpressionSignatureHelpProvider.vb | 6 +++-- ...ssionSignatureHelpProvider.DelegateType.vb | 3 ++- ...ressionSignatureHelpProvider.NormalType.vb | 3 ++- ...CreationExpressionSignatureHelpProvider.vb | 8 +++---- ...inedCastExpressionSignatureHelpProvider.vb | 9 +++---- ...aiseEventStatementSignatureHelpProvider.vb | 8 +++---- .../SignatureHelp/SignatureHelpUtilities.vb | 4 ++-- .../Portable/VBFeaturesResources.Designer.vb | 9 +++++++ .../Portable/VBFeaturesResources.resx | 3 +++ .../Test/DebuggerIntelliSense/TestState.vb | 1 + 107 files changed, 303 insertions(+), 275 deletions(-) rename src/{EditorFeatures/CSharp => Features/CSharp/Portable}/SignatureHelp/AbstractCSharpSignatureHelpProvider.cs (93%) rename src/{EditorFeatures/CSharp => Features/CSharp/Portable}/SignatureHelp/AttributeSignatureHelpProvider.cs (97%) rename src/{EditorFeatures/CSharp => Features/CSharp/Portable}/SignatureHelp/ConstructorInitializerSignatureHelpProvider.cs (97%) rename src/{EditorFeatures/CSharp => Features/CSharp/Portable}/SignatureHelp/ElementAccessExpressionSignatureHelpProvider.cs (99%) rename src/{EditorFeatures/CSharp => Features/CSharp/Portable}/SignatureHelp/GenericNamePartiallyWrittenSignatureHelpProvider.cs (88%) rename src/{EditorFeatures/CSharp => Features/CSharp/Portable}/SignatureHelp/GenericNameSignatureHelpProvider.cs (98%) rename src/{EditorFeatures/CSharp => Features/CSharp/Portable}/SignatureHelp/GenericNameSignatureHelpProvider_Method.cs (97%) rename src/{EditorFeatures/CSharp => Features/CSharp/Portable}/SignatureHelp/GenericNameSignatureHelpProvider_NamedType.cs (90%) rename src/{EditorFeatures/CSharp => Features/CSharp/Portable}/SignatureHelp/InvocationExpressionSignatureHelpProvider.cs (97%) rename src/{EditorFeatures/CSharp => Features/CSharp/Portable}/SignatureHelp/InvocationExpressionSignatureHelpProvider_DelegateInvoke.cs (97%) rename src/{EditorFeatures/CSharp => Features/CSharp/Portable}/SignatureHelp/InvocationExpressionSignatureHelpProvider_MethodGroup.cs (98%) rename src/{EditorFeatures/CSharp => Features/CSharp/Portable}/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider.cs (96%) rename src/{EditorFeatures/CSharp => Features/CSharp/Portable}/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider_DelegateType.cs (97%) rename src/{EditorFeatures/CSharp => Features/CSharp/Portable}/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider_NormalType.cs (97%) rename src/{EditorFeatures/CSharp => Features/CSharp/Portable}/SignatureHelp/SignatureHelpUtilities.cs (95%) rename src/{EditorFeatures/Core/Implementation/IntelliSense => Features/Core/Portable}/SignatureHelp/AbstractSignatureHelpProvider.SymbolKeySignatureHelpItem.cs (96%) rename src/{EditorFeatures/Core/Implementation/IntelliSense => Features/Core/Portable}/SignatureHelp/AbstractSignatureHelpProvider.cs (99%) rename src/{EditorFeatures/Core/Implementation/IntelliSense => Features/Core/Portable}/SignatureHelp/CommonSignatureHelpUtilities.cs (99%) rename src/{EditorFeatures/Core/Extensibility => Features/Core/Portable}/SignatureHelp/ExportSignatureHelpProviderAttribute.cs (91%) rename src/{EditorFeatures/Core/Extensibility => Features/Core/Portable}/SignatureHelp/ISignatureHelpProvider.cs (95%) rename src/{EditorFeatures/Core/Extensibility => Features/Core/Portable}/SignatureHelp/SignatureHelpItem.cs (95%) rename src/{EditorFeatures/Core/Extensibility => Features/Core/Portable}/SignatureHelp/SignatureHelpItems.cs (98%) rename src/{EditorFeatures/Core/Extensibility => Features/Core/Portable}/SignatureHelp/SignatureHelpParameter.cs (98%) rename src/{EditorFeatures/Core/Extensibility => Features/Core/Portable}/SignatureHelp/SignatureHelpState.cs (93%) rename src/{EditorFeatures/Core/Extensibility => Features/Core/Portable}/SignatureHelp/SignatureHelpTriggerInfo.cs (94%) rename src/{EditorFeatures/Core/Extensibility => Features/Core/Portable}/SignatureHelp/SignatureHelpTriggerReason.cs (93%) rename src/{EditorFeatures/VisualBasic => Features/VisualBasic/Portable}/SignatureHelp/AbstractIntrinsicOperatorSignatureHelpProvider.vb (97%) rename src/{EditorFeatures/VisualBasic => Features/VisualBasic/Portable}/SignatureHelp/AbstractSignatureHelpProvider.vb (95%) rename src/{EditorFeatures/VisualBasic => Features/VisualBasic/Portable}/SignatureHelp/AddRemoveHandlerSignatureHelpProvider.vb (92%) rename src/{EditorFeatures/VisualBasic => Features/VisualBasic/Portable}/SignatureHelp/AttributeSignatureHelpProvider.vb (97%) rename src/{EditorFeatures/VisualBasic => Features/VisualBasic/Portable}/SignatureHelp/CastExpressionSignatureHelpProvider.vb (90%) rename src/{EditorFeatures/VisualBasic => Features/VisualBasic/Portable}/SignatureHelp/ConditionalExpressionSignatureHelpProvider.vb (91%) rename src/{EditorFeatures/VisualBasic => Features/VisualBasic/Portable}/SignatureHelp/FunctionAggregationSignatureHelpProvider.vb (98%) rename src/{EditorFeatures/VisualBasic => Features/VisualBasic/Portable}/SignatureHelp/GenericNameSignatureHelpProvider.Method.vb (97%) rename src/{EditorFeatures/VisualBasic => Features/VisualBasic/Portable}/SignatureHelp/GenericNameSignatureHelpProvider.NamedType.vb (94%) rename src/{EditorFeatures/VisualBasic => Features/VisualBasic/Portable}/SignatureHelp/GenericNameSignatureHelpProvider.vb (98%) rename src/{EditorFeatures/VisualBasic => Features/VisualBasic/Portable}/SignatureHelp/GetTypeExpressionSignatureHelpProvider.vb (86%) rename src/{EditorFeatures/VisualBasic => Features/VisualBasic/Portable}/SignatureHelp/GetXmlNamespaceExpressionSignatureHelpProvider.vb (86%) rename src/{EditorFeatures/VisualBasic => Features/VisualBasic/Portable}/SignatureHelp/InvocationExpressionSignatureHelpProvider.DelegateInvoke.vb (97%) rename src/{EditorFeatures/VisualBasic => Features/VisualBasic/Portable}/SignatureHelp/InvocationExpressionSignatureHelpProvider.ElementAccess.vb (95%) rename src/{EditorFeatures/VisualBasic => Features/VisualBasic/Portable}/SignatureHelp/InvocationExpressionSignatureHelpProvider.MemberGroup.vb (98%) rename src/{EditorFeatures/VisualBasic => Features/VisualBasic/Portable}/SignatureHelp/InvocationExpressionSignatureHelpProvider.vb (97%) rename src/{EditorFeatures/VisualBasic => Features/VisualBasic/Portable}/SignatureHelp/MidAssignmentSignatureHelpProvider.vb (90%) rename src/{EditorFeatures/VisualBasic => Features/VisualBasic/Portable}/SignatureHelp/NameOfExpressionSignatureHelpProvider.vb (89%) rename src/{EditorFeatures/VisualBasic => Features/VisualBasic/Portable}/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider.DelegateType.vb (97%) rename src/{EditorFeatures/VisualBasic => Features/VisualBasic/Portable}/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider.NormalType.vb (97%) rename src/{EditorFeatures/VisualBasic => Features/VisualBasic/Portable}/SignatureHelp/ObjectCreationExpressionSignatureHelpProvider.vb (96%) rename src/{EditorFeatures/VisualBasic => Features/VisualBasic/Portable}/SignatureHelp/PredefinedCastExpressionSignatureHelpProvider.vb (87%) rename src/{EditorFeatures/VisualBasic => Features/VisualBasic/Portable}/SignatureHelp/RaiseEventStatementSignatureHelpProvider.vb (97%) rename src/{EditorFeatures/VisualBasic => Features/VisualBasic/Portable}/SignatureHelp/SignatureHelpUtilities.vb (97%) diff --git a/src/EditorFeatures/CSharp/CSharpEditorFeatures.csproj b/src/EditorFeatures/CSharp/CSharpEditorFeatures.csproj index 4e768d1408462..6d42fb08064c4 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 4819e2db041de..09cb8acc63c68 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 fe637af5bc5a7..7be81d104edf6 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 4614857055b24..a7e590ea6b897 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 8af1ade5a0667..2edf867ace5c5 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 e801f752667b5..6198e7b30baa8 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 6426bb23fc15f..067cac4124a70 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 9c23564a4e6a7..449a92ae7c0ea 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 3f9c787ce3b91..d29c9e5c8d86c 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 eb82743f70f9c..7e669d6a3213b 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 5cb2147f356eb..63f4366d66377 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 65dc684c09b8c..53b25318ce0c2 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 e7d37260173e2..12b30addce18a 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 417499b0d5fb3..b55a442b577fb 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 01fb8a69e8c8e..18218a20c16f0 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 91a9e0365fb76..58bb4365383a0 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 b059934ff7b95..3030e649ae4f7 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 fbddae707b26d..bcd06f5364332 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 4d507982c0fef..dfe4ce028ba3a 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 aa1b723b3741c..348f3971b9b05 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 7fd1f1bc849b6..2f4a454cc0671 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 9cdbcf159de99..ca6f7ff868523 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 35c62d942ce00..3f4e8e6a6fc08 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 cfea61d116876..c76e8a9083c42 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 ef31ec715b7d1..38750eefd3f50 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 6cb8dbb920988..de03f9749f063 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 9bf87aa048061..71c6b5861b4e7 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 cde1dd8f9feb4..770aea76df31a 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 22b9d359b47cf..957a86d02aa28 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 807f476248b1f..8f0457712c27d 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 9e051a0709836..184ae5dbdc7e5 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 bca02841b0237..75cfb060bd9ce 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 b57c34f4595b4..07efc7865a24e 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 c94a72bf33faa..408eb79f5278a 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 c3ee83685e745..74dd1624729c3 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 a35920652e4bd..5f453d2634147 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 9e395a2409006..b4df8889edf5f 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 669e70d59d76e..9c04810de741b 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 ba61d021a7288..1c7a701ec535b 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 3bd9aee302214..f44b56435586d 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 160ff7ad8f2b7..6df77016affd7 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 9ffc9bfadb174..4413dfc5fc084 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 289a2d50b2034..75a639da6c2ea 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 7fc7e9ae4a4e3..b9b4b1f17a0a1 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 c17a4903043a9..9a5113dc050a5 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 d3f645f3c4519..4c622e2044dee 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 9fd6643486ea7..f68a77543e30c 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 aa6c7551aba0c..fff106a786278 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 bfab6ec680dce..ccc7147a337a2 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 b1a7e54b52a3c..1e7dd614662dd 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 b2ecacd5ccc16..f86517b0a77d5 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 542793aeb4e75..c6a52efee5b9a 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 9a6280e36f22f..e6f31b9336302 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 ad1b3c271fd6d..2381c4a5a6e21 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 851c66eab7a10..225a3a47eb2d3 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 a152b4e90b70f..82a646ce10ef2 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 f58d70c07a057..6af9714d9aebb 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 2d6994ae8505e..2519bac958d9d 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 47bd93612568d..8e7c56915511c 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 07f2ea3e5d995..05f0467094d82 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 82b1a7cc1680b..af9496955f5db 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 caf90f98b9118..641e4cc903f9d 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 ad1d6aaa3f7d5..85fcccdc00d16 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 9e9c39edcaa3b..2da85b4852a92 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 e4133192d2cfb..321f756397919 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 1a4bdd6fcf44b..f226eaf2d354d 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 783e50d9a16fd..d2d133a80f7b0 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 078b7863c4011..ad5a696c65137 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 db90b3cfe31df..afc12e824c728 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 aa9b722bacfc2..2cbd3209024d5 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 c6e5297bc9edf..fa5c9910248bf 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 57c5f94cb25bd..63dd8a748fa01 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 44384afa0605f..45ed3a19bec4f 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 3dd06233ab819..62bb5e46a5c25 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 634531ea5af01..1b7c5e04f2efd 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 8777dbfc0e4ab..417031b979e01 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 5c8e521263185..b2fc5d2f12393 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 3b89facae8298..9b49bcca8bfb8 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 211c9541de0bc..8f4e0a35a37b7 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 aeb9c3e89372f..4d370a4ec35ae 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 2bdb51c2400aa..f052922db470b 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 b2507c5d54a33..78466c5d8dbe7 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 171d5d934fc36..1a5f54436db73 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 12c5ca14eb23d..f6b7e5eb604b5 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 350b8299cb5f5..28e32f563ed72 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 c768635dd4833..cc1cfbca84fb3 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 535daa8abf49d..9407711c869b4 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 0578303121f33..7439d98588d5e 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 fe810cafa7ac0..52fb82d64550a 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 014ea2f28cba0..382619891bdf0 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 23da71f984e58..5404089f74c25 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 8c3b5674f96d8..f4c867ea082a4 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 b1384943ed044..8e372f44c2290 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 002860792a214..c7e033d690e3e 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 d5e1f9b9bea31..7a5c5aabff328 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 745bddb7149b0..79590b07468ef 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 23b7a9eb82804..084b2a3cefe19 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 4b65f613eedbc..f9f229b778003 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 d581708a35512..1e837395bd302 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 1b135841c8861..6eeda69e4980a 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 efd5e9b18a1a3..42d1ed2be5159 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 6537ebc3603ac..0c3ec68a0bec9 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 e06a703f7156f..7f1a40a3e2d96 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 a05fdba4f13e1..1bf933f1f791a 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 c91ef77f3b6c5..8dbdac11faba8 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 6334ee68d26f8..364e5d89877e5 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 c9cc45a6d1330..70c30b08a44a3 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 From 88b6321c267fbc9194f50f81e4a1a8714f7eb56f Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Thu, 5 May 2016 19:37:20 -0700 Subject: [PATCH 3/3] Upgrade the version of dotnet-cli used in the mac/linux toolsets (#11075) Most of this PR is invisible. What I did was pull down the current toolset packages from azure and replaced the files in the dotnet-cli folder with new ones downloaded from https://github.com/dotnet/cli --- Makefile | 4 ++-- build/scripts/restore.sh | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 5305e451ef110..ee54c779b63b9 100644 --- a/Makefile +++ b/Makefile @@ -12,10 +12,10 @@ MSBUILD_ADDITIONALARGS := /v:m /fl /fileloggerparameters:Verbosity=normal /p:Con ifeq ($(OS_NAME),Linux) MSBUILD_ADDITIONALARGS := $(MSBUILD_ADDITIONALARGS) /p:BaseNuGetRuntimeIdentifier=ubuntu.14.04 - ROSLYN_TOOLSET_NAME = roslyn.linux.6 + ROSLYN_TOOLSET_NAME = roslyn.linux.7 else ifeq ($(OS_NAME),Darwin) MSBUILD_ADDITIONALARGS := $(MSBUILD_ADDITIONALARGS) /p:BaseNuGetRuntimeIdentifier=osx.10.10 - ROSLYN_TOOLSET_NAME = roslyn.mac.5 + ROSLYN_TOOLSET_NAME = roslyn.mac.6 endif ifneq ($(BUILD_LOG_PATH),) diff --git a/build/scripts/restore.sh b/build/scripts/restore.sh index 04b741f2364df..dcfc5ec1e823b 100755 --- a/build/scripts/restore.sh +++ b/build/scripts/restore.sh @@ -6,10 +6,6 @@ DOTNET_PATH=$ROSLYN_TOOLSET_PATH/dotnet-cli/dotnet # Workaround, see https://github.com/dotnet/roslyn/issues/10210 export HOME=$(cd ~ && pwd) -# NuGet often exceeds the limit of open files on Mac and Linux -# https://github.com/NuGet/Home/issues/2163 -ulimit -n 6500 - echo "Restoring toolset packages" $DOTNET_PATH restore -v Minimal --disable-parallel $(pwd)/build/ToolsetPackages/project.json