Merge pull request #5684 from drewnoakes/vb-simplifications

VB code simplifications

Author: drewnoakes

src/Microsoft.VisualStudio.AppDesigner/ApplicationDesigner/ApplicationDesignerEditorFactory.vb

@@ -29,14 +29,14 @@ Namespace Microsoft.VisualStudio.Editors.ApplicationDesigner
         Private Shared ReadOnly s_commandUIGuid As New Guid("{d06cd5e3-d961-44dc-9d80-c89a1a8d9d56}")
 
         'Exposing the GUID for the rest of the assembly to see
-        Public Shared ReadOnly Property EditorGuid() As Guid
+        Public Shared ReadOnly Property EditorGuid As Guid
             Get
                 Return s_editorGuid
             End Get
         End Property
 
         'Exposing the GUID for the rest of the assembly to see
-        Public Shared ReadOnly Property CommandUIGuid() As Guid
+        Public Shared ReadOnly Property CommandUIGuid As Guid
             Get
                 Return s_commandUIGuid
             End Get

src/Microsoft.VisualStudio.AppDesigner/ApplicationDesigner/ApplicationDesignerPanel.vb

@@ -128,13 +128,13 @@ Namespace Microsoft.VisualStudio.Editors.ApplicationDesigner
         ''' Returns the PropertyPageInfo for this designer panel, if it corresponds to a property page.
         ''' Otherwise returns Nothing.
         ''' </summary>
-        Public ReadOnly Property PropertyPageInfo() As PropertyPageInfo
+        Public ReadOnly Property PropertyPageInfo As PropertyPageInfo
             Get
                 Return _propertyPageInfo
             End Get
         End Property
 
-        Public ReadOnly Property IsPropertyPage() As Boolean
+        Public ReadOnly Property IsPropertyPage As Boolean
             Get
                 Dim ReturnValue As Boolean = (_propertyPageInfo IsNot Nothing)
                 Debug.Assert(Not ReturnValue OrElse EditorGuid.Equals(GetType(PropPageDesigner.PropPageDesignerEditorFactory).GUID),
@@ -143,19 +143,19 @@ Namespace Microsoft.VisualStudio.Editors.ApplicationDesigner
             End Get
         End Property
 
-        Public ReadOnly Property Hierarchy() As IVsHierarchy
+        Public ReadOnly Property Hierarchy As IVsHierarchy
             Get
                 Return _hierarchy
             End Get
         End Property
 
-        Public ReadOnly Property ItemId() As UInteger
+        Public ReadOnly Property ItemId As UInteger
             Get
                 Return _itemId
             End Get
         End Property
 
-        Public ReadOnly Property DocCookie() As UInteger
+        Public ReadOnly Property DocCookie As UInteger
             Get
                 Return _docCookie
             End Get
@@ -165,11 +165,11 @@ Namespace Microsoft.VisualStudio.Editors.ApplicationDesigner
         ''' Provides a custom view control that can be displayed instead of hosting a designer.  We can display either
         '''   a custom view provider or a hosted designer, but not both at once.
         ''' </summary>
-        Public Property CustomViewProvider() As CustomViewProvider
+        Public Property CustomViewProvider As CustomViewProvider
             Get
                 Return _customViewProvider
             End Get
-            Set(value As CustomViewProvider)
+            Set
                 If _customViewProvider Is value Then
                     Exit Property
                 End If
@@ -646,11 +646,11 @@ Namespace Microsoft.VisualStudio.Editors.ApplicationDesigner
         ''' <summary>
         ''' Get/set the window frame owned by this panel
         ''' </summary>
-        Public Property VsWindowFrame() As IVsWindowFrame
+        Public Property VsWindowFrame As IVsWindowFrame
             Get
                 Return _vsWindowFrame
             End Get
-            Set(Value As IVsWindowFrame)
+            Set
                 If Value IsNot _vsWindowFrame Then
                     Common.Switches.TracePDFocus(TraceLevel.Info, "ApplicationDesignerPanel.set_VsWindowFrame")
                     CloseFrame()
@@ -669,11 +669,11 @@ Namespace Microsoft.VisualStudio.Editors.ApplicationDesigner
         ''' The Guid used by the editor for this panel.  For property pages, this is always
         '''   PropPageDesignerView's guid.
         ''' </summary>
-        Public Property EditorGuid() As Guid
+        Public Property EditorGuid As Guid
             Get
                 Return _editorGuid
             End Get
-            Set(Value As Guid)
+            Set
                 If IsPropertyPage Then
                     Debug.Fail("Cannot change EditorGuid for property page designer panels")
                     Exit Property
@@ -687,7 +687,7 @@ Namespace Microsoft.VisualStudio.Editors.ApplicationDesigner
         ''' The Guid used by the object actually represented in this panel.  For property pages,
         '''   this is the guid of the property page.  For all others, this is the same as EditorGuid.
         ''' </summary>
-        Public ReadOnly Property ActualGuid() As Guid
+        Public ReadOnly Property ActualGuid As Guid
             Get
                 If _propertyPageInfo IsNot Nothing Then
                     Return _propertyPageInfo.Guid
@@ -700,31 +700,31 @@ Namespace Microsoft.VisualStudio.Editors.ApplicationDesigner
         ''' <summary>
         ''' Physical view guid for the editor
         ''' </summary>
-        Public Property PhysicalView() As String
+        Public Property PhysicalView As String
             Get
                 Return _physicalView
             End Get
-            Set(Value As String)
+            Set
                 _physicalView = Value
             End Set
         End Property
 
         ''' <summary>
         ''' The editor's caption
         ''' </summary>
-        Public Property EditorCaption() As String
+        Public Property EditorCaption As String
             Get
                 Return _editorCaption
             End Get
-            Set(Value As String)
+            Set
                 _editorCaption = Value
             End Set
         End Property
 
         ''' <summary>
         ''' The filename moniker of the file which is being edited by the editor
         ''' </summary>
-        Public Property MkDocument() As String
+        Public Property MkDocument As String
             Get
                 If _mkDocument <> "" Then
                     Return _mkDocument
@@ -734,7 +734,7 @@ Namespace Microsoft.VisualStudio.Editors.ApplicationDesigner
                     Return ""
                 End If
             End Get
-            Set(Value As String)
+            Set
                 Debug.Assert(_mkDocument Is Nothing, "MkDocument set multiple times")
                 _mkDocument = Value
             End Set
@@ -743,11 +743,11 @@ Namespace Microsoft.VisualStudio.Editors.ApplicationDesigner
         ''' <summary>
         ''' The filename moniker of the file which is being edited by the editor
         ''' </summary>
-        Public Property CustomMkDocumentProvider() As CustomDocumentMonikerProvider
+        Public Property CustomMkDocumentProvider As CustomDocumentMonikerProvider
             Get
                 Return _customMkDocumentProvider
             End Get
-            Set(Value As CustomDocumentMonikerProvider)
+            Set
                 Debug.Assert(_customMkDocumentProvider Is Nothing OrElse Value Is Nothing, "m_CustomMkDocumentProvider set multiple times")
                 _customMkDocumentProvider = Value
             End Set
@@ -756,47 +756,47 @@ Namespace Microsoft.VisualStudio.Editors.ApplicationDesigner
         ''' <summary>
         ''' The DocData for the editor
         ''' </summary>
-        Public Property DocData() As Object
+        Public Property DocData As Object
             Get
                 Return _docData
             End Get
-            Set(Value As Object)
+            Set
                 _docData = Value
             End Set
         End Property
 
         ''' <summary>
         ''' The DocView for the editor
         ''' </summary>
-        Public Property DocView() As Control
+        Public Property DocView As Control
             Get
                 Return _docView
             End Get
-            Set(Value As Control)
+            Set
                 _docView = Value
             End Set
         End Property
 
         ''' <summary>
         ''' Flags to be passed to VsUIShellOpenDocument
         ''' </summary>
-        Public Property EditFlags() As UInteger
+        Public Property EditFlags As UInteger
             Get
                 Return _editFlags
             End Get
-            Set(Value As UInteger)
+            Set
                 _editFlags = Value
             End Set
         End Property
 
         ''' <summary>
         ''' The title that should be used for this panel's tab
         ''' </summary>
-        Public Property TabTitle() As String
+        Public Property TabTitle As String
             Get
                 Return _tabTitle
             End Get
-            Set(value As String)
+            Set
                 _tabTitle = value
 
                 ' We set Window.Text to be the page Title to help screen reader.
@@ -813,11 +813,11 @@ Namespace Microsoft.VisualStudio.Editors.ApplicationDesigner
         ''' <summary>
         ''' The name for the tab that is not localized and is seen by QA automation tools
         ''' </summary>
-        Public Property TabAutomationName() As String
+        Public Property TabAutomationName As String
             Get
                 Return _tabAutomationName
             End Get
-            Set(value As String)
+            Set
                 _tabAutomationName = value
             End Set
         End Property
@@ -1033,7 +1033,7 @@ Namespace Microsoft.VisualStudio.Editors.ApplicationDesigner
         '''<summary>
         ''' Initialize layout...
         '''</summary>
-        <DebuggerStepThrough()>
+        <DebuggerStepThrough>
         Private Sub InitializeComponent()
             _pageHostingPanel = New Panel
             _pageNameLabel = New Label

src/Microsoft.VisualStudio.AppDesigner/ApplicationDesigner/ApplicationDesignerRootComponent.vb

@@ -25,7 +25,7 @@ Namespace Microsoft.VisualStudio.Editors.ApplicationDesigner
         '''   resx file to be edited by the user.
         ''' </summary>
         ''' <value>The associated ResourceEditorRootDesigner.</value>
-        Public ReadOnly Property RootDesigner() As ApplicationDesignerRootDesigner
+        Public ReadOnly Property RootDesigner As ApplicationDesignerRootDesigner
             Get
                 If _rootDesigner Is Nothing Then
                     'Not yet cached - get this info from the designer host
@@ -42,23 +42,23 @@ Namespace Microsoft.VisualStudio.Editors.ApplicationDesigner
         ''' <summary>
         ''' The IVsHierarchy associated with the AppDesigner node
         ''' </summary>
-        Public Property Hierarchy() As IVsHierarchy
+        Public Property Hierarchy As IVsHierarchy
             Get
                 Return _hierarchy
             End Get
-            Set(Value As IVsHierarchy)
+            Set
                 _hierarchy = Value
             End Set
         End Property
 
         ''' <summary>
         ''' The ItemId associated with the AppDesigner node
         ''' </summary>
-        Public Property ItemId() As UInteger
+        Public Property ItemId As UInteger
             Get
                 Return _itemId
             End Get
-            Set(Value As UInteger)
+            Set
                 _itemId = Value
             End Set
         End Property

src/Microsoft.VisualStudio.AppDesigner/ApplicationDesigner/ApplicationDesignerRootDesigner.vb

@@ -24,7 +24,7 @@ Namespace Microsoft.VisualStudio.Editors.ApplicationDesigner
         ''' Returns the ApplicationDesignerRootComponent component that is being edited by this designer.
         ''' </summary>
         ''' <value>The ApplicationDesignerRootComponent object.</value>
-        Public Shadows ReadOnly Property Component() As ApplicationDesignerRootComponent
+        Public Shadows ReadOnly Property Component As ApplicationDesignerRootComponent
             Get
                 Dim RootComponent As ApplicationDesignerRootComponent = CType(MyBase.Component, ApplicationDesignerRootComponent)
                 Debug.Assert(Not RootComponent Is Nothing)
@@ -77,7 +77,7 @@ Namespace Microsoft.VisualStudio.Editors.ApplicationDesigner
         ''' <remarks>
         ''' The view technology we support, which is currently only Windows Forms
         ''' </remarks>
-        Private ReadOnly Property IRootDesigner_SupportedTechnologies() As ViewTechnology() Implements IRootDesigner.SupportedTechnologies
+        Private ReadOnly Property IRootDesigner_SupportedTechnologies As ViewTechnology() Implements IRootDesigner.SupportedTechnologies
             Get
                 Return New ViewTechnology() {ViewTechnology.Default}
             End Get

src/Microsoft.VisualStudio.AppDesigner/ApplicationDesigner/ApplicationDesignerView.vb

@@ -253,7 +253,7 @@ Namespace Microsoft.VisualStudio.Editors.ApplicationDesigner
             End If
         End Sub
 
-        Public ReadOnly Property WindowFrame() As IVsWindowFrame
+        Public ReadOnly Property WindowFrame As IVsWindowFrame
             Get
                 Return CType(GetService(GetType(IVsWindowFrame)), IVsWindowFrame)
             End Get
@@ -262,13 +262,13 @@ Namespace Microsoft.VisualStudio.Editors.ApplicationDesigner
         ''' <summary>
         ''' Retrieves the DTE project object associated with this project designer instance.
         ''' </summary>
-        Public ReadOnly Property DTEProject() As Project
+        Public ReadOnly Property DTEProject As Project
             Get
                 Return _dteProject
             End Get
         End Property
 
-        Public ReadOnly Property SpecialFiles() As IVsProjectSpecialFiles
+        Public ReadOnly Property SpecialFiles As IVsProjectSpecialFiles
             Get
                 Return _specialFiles
             End Get
@@ -278,7 +278,7 @@ Namespace Microsoft.VisualStudio.Editors.ApplicationDesigner
         ''' Instance of the loaded IVBPackage
         ''' </summary>
         ''' <remarks>Used to persist user data</remarks>
-        Private ReadOnly Property Package() As IVBPackage
+        Private ReadOnly Property Package As IVBPackage
             Get
                 If _editorsPackage Is Nothing Then
                     Dim shell As IVsShell = DirectCast(GetService(GetType(IVsShell)), IVsShell)
@@ -297,7 +297,7 @@ Namespace Microsoft.VisualStudio.Editors.ApplicationDesigner
         ''' <summary>
         ''' Get/set the last viewed tab of for this application page...
         ''' </summary>
-        Private Property LastShownTab() As Integer
+        Private Property LastShownTab As Integer
             Get
                 Dim editorsPackage As IVBPackage = Package
                 If editorsPackage IsNot Nothing Then
@@ -308,7 +308,7 @@ Namespace Microsoft.VisualStudio.Editors.ApplicationDesigner
                 End If
                 Return 0
             End Get
-            Set(value As Integer)
+            Set
                 Dim editorsPackage As IVBPackage = Package
                 If editorsPackage IsNot Nothing Then
                     editorsPackage.SetLastShownApplicationDesignerTab(_projectHierarchy, value)
@@ -564,7 +564,7 @@ Namespace Microsoft.VisualStudio.Editors.ApplicationDesigner
         End Function
 
         Private _vsCfgProvider As IVsCfgProvider2
-        Private ReadOnly Property VsCfgProvider() As IVsCfgProvider2
+        Private ReadOnly Property VsCfgProvider As IVsCfgProvider2
             Get
                 If _vsCfgProvider Is Nothing Then
                     Dim Value As Object = Nothing
@@ -586,7 +586,7 @@ Namespace Microsoft.VisualStudio.Editors.ApplicationDesigner
         End Function
 
 
-        Public Property ActiveView() As Guid
+        Public Property ActiveView As Guid
             Get
                 If _activePanelIndex < 0 OrElse _activePanelIndex >= _designerPanels.Length OrElse _designerPanels(_activePanelIndex) Is Nothing Then
                     Return Guid.Empty
@@ -597,7 +597,7 @@ Namespace Microsoft.VisualStudio.Editors.ApplicationDesigner
                 Return Panel.ActualGuid
             End Get
 
-            Set(Value As Guid)
+            Set
                 Common.Switches.TracePDFocus(TraceLevel.Info, "ApplicationDesignerView: set_ActiveView")
                 'Find the guid and switch to that tab
                 'Keep the current tab if guid not found
@@ -1328,7 +1328,7 @@ Namespace Microsoft.VisualStudio.Editors.ApplicationDesigner
         '''   by ApplicationDesignerPanel to delay any window frame activations until after
         '''   initialization.
         ''' </summary>
-        Public ReadOnly Property InitializationComplete() As Boolean
+        Public ReadOnly Property InitializationComplete As Boolean
             Get
                 Return _initializationComplete
             End Get