├── .gitignore ├── LICENSE ├── README.md ├── images ├── cover-git.png ├── cover.png ├── dividers_dark.png ├── dividers_light.png ├── editor.png ├── editor_new.png ├── example_code.png ├── example_dark.png ├── example_light.png ├── menu.png └── options.png └── src ├── Commands ├── CreateHighlight.cs ├── EditColor.xaml └── EditColor.xaml.cs ├── Core ├── Adorner.cs ├── AdornerTextViewCreationListener.cs ├── Enums.cs ├── Helper.cs └── HighlightTag.cs ├── Highlighter.csproj ├── Highlighter.csproj.DotSettings ├── Highlighter.sln ├── HighlighterPackage.cs ├── HighlighterPackage.ico ├── HighlighterPackage.png ├── License.txt ├── Options └── HighlighterOptions.cs ├── Properties └── AssemblyInfo.cs ├── Remember.cs ├── VSCommandTable.cs ├── VSCommandTable.vsct ├── source.extension.cs └── source.extension.vsixmanifest /.gitignore: -------------------------------------------------------------------------------- 1 | ## Ignore Visual Studio temporary files, build results, and 2 | ## files generated by popular Visual Studio add-ons. 3 | ## 4 | ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore 5 | 6 | # User-specific files 7 | *.rsuser 8 | *.suo 9 | *.user 10 | *.userosscache 11 | *.sln.docstates 12 | 13 | # User-specific files (MonoDevelop/Xamarin Studio) 14 | *.userprefs 15 | 16 | # Mono auto generated files 17 | mono_crash.* 18 | 19 | # Build results 20 | [Dd]ebug/ 21 | [Dd]ebugPublic/ 22 | [Rr]elease/ 23 | [Rr]eleases/ 24 | x64/ 25 | x86/ 26 | [Aa][Rr][Mm]/ 27 | [Aa][Rr][Mm]64/ 28 | bld/ 29 | [Bb]in/ 30 | [Oo]bj/ 31 | [Ll]og/ 32 | [Ll]ogs/ 33 | 34 | # Visual Studio 2015/2017 cache/options directory 35 | .vs/ 36 | # Uncomment if you have tasks that create the project's static files in wwwroot 37 | #wwwroot/ 38 | 39 | # Visual Studio 2017 auto generated files 40 | Generated\ Files/ 41 | 42 | # MSTest test Results 43 | [Tt]est[Rr]esult*/ 44 | [Bb]uild[Ll]og.* 45 | 46 | # NUnit 47 | *.VisualState.xml 48 | TestResult.xml 49 | nunit-*.xml 50 | 51 | # Build Results of an ATL Project 52 | [Dd]ebugPS/ 53 | [Rr]eleasePS/ 54 | dlldata.c 55 | 56 | # Benchmark Results 57 | BenchmarkDotNet.Artifacts/ 58 | 59 | # .NET Core 60 | project.lock.json 61 | project.fragment.lock.json 62 | artifacts/ 63 | 64 | # StyleCop 65 | StyleCopReport.xml 66 | 67 | # Files built by Visual Studio 68 | *_i.c 69 | *_p.c 70 | *_h.h 71 | *.ilk 72 | *.meta 73 | *.obj 74 | *.iobj 75 | *.pch 76 | *.pdb 77 | *.ipdb 78 | *.pgc 79 | *.pgd 80 | *.rsp 81 | *.sbr 82 | *.tlb 83 | *.tli 84 | *.tlh 85 | *.tmp 86 | *.tmp_proj 87 | *_wpftmp.csproj 88 | *.log 89 | *.vspscc 90 | *.vssscc 91 | .builds 92 | *.pidb 93 | *.svclog 94 | *.scc 95 | 96 | # Chutzpah Test files 97 | _Chutzpah* 98 | 99 | # Visual C++ cache files 100 | ipch/ 101 | *.aps 102 | *.ncb 103 | *.opendb 104 | *.opensdf 105 | *.sdf 106 | *.cachefile 107 | *.VC.db 108 | *.VC.VC.opendb 109 | 110 | # Visual Studio profiler 111 | *.psess 112 | *.vsp 113 | *.vspx 114 | *.sap 115 | 116 | # Visual Studio Trace Files 117 | *.e2e 118 | 119 | # TFS 2012 Local Workspace 120 | $tf/ 121 | 122 | # Guidance Automation Toolkit 123 | *.gpState 124 | 125 | # ReSharper is a .NET coding add-in 126 | _ReSharper*/ 127 | *.[Rr]e[Ss]harper 128 | *.DotSettings.user 129 | 130 | # TeamCity is a build add-in 131 | _TeamCity* 132 | 133 | # DotCover is a Code Coverage Tool 134 | *.dotCover 135 | 136 | # AxoCover is a Code Coverage Tool 137 | .axoCover/* 138 | !.axoCover/settings.json 139 | 140 | # Visual Studio code coverage results 141 | *.coverage 142 | *.coveragexml 143 | 144 | # NCrunch 145 | _NCrunch_* 146 | .*crunch*.local.xml 147 | nCrunchTemp_* 148 | 149 | # MightyMoose 150 | *.mm.* 151 | AutoTest.Net/ 152 | 153 | # Web workbench (sass) 154 | .sass-cache/ 155 | 156 | # Installshield output folder 157 | [Ee]xpress/ 158 | 159 | # DocProject is a documentation generator add-in 160 | DocProject/buildhelp/ 161 | DocProject/Help/*.HxT 162 | DocProject/Help/*.HxC 163 | DocProject/Help/*.hhc 164 | DocProject/Help/*.hhk 165 | DocProject/Help/*.hhp 166 | DocProject/Help/Html2 167 | DocProject/Help/html 168 | 169 | # Click-Once directory 170 | publish/ 171 | 172 | # Publish Web Output 173 | *.[Pp]ublish.xml 174 | *.azurePubxml 175 | # Note: Comment the next line if you want to checkin your web deploy settings, 176 | # but database connection strings (with potential passwords) will be unencrypted 177 | *.pubxml 178 | *.publishproj 179 | 180 | # Microsoft Azure Web App publish settings. Comment the next line if you want to 181 | # checkin your Azure Web App publish settings, but sensitive information contained 182 | # in these scripts will be unencrypted 183 | PublishScripts/ 184 | 185 | # NuGet Packages 186 | *.nupkg 187 | # NuGet Symbol Packages 188 | *.snupkg 189 | # The packages folder can be ignored because of Package Restore 190 | **/[Pp]ackages/* 191 | # except build/, which is used as an MSBuild target. 192 | !**/[Pp]ackages/build/ 193 | # Uncomment if necessary however generally it will be regenerated when needed 194 | #!**/[Pp]ackages/repositories.config 195 | # NuGet v3's project.json files produces more ignorable files 196 | *.nuget.props 197 | *.nuget.targets 198 | 199 | # Microsoft Azure Build Output 200 | csx/ 201 | *.build.csdef 202 | 203 | # Microsoft Azure Emulator 204 | ecf/ 205 | rcf/ 206 | 207 | # Windows Store app package directories and files 208 | AppPackages/ 209 | BundleArtifacts/ 210 | Package.StoreAssociation.xml 211 | _pkginfo.txt 212 | *.appx 213 | *.appxbundle 214 | *.appxupload 215 | 216 | # Visual Studio cache files 217 | # files ending in .cache can be ignored 218 | *.[Cc]ache 219 | # but keep track of directories ending in .cache 220 | !?*.[Cc]ache/ 221 | 222 | # Others 223 | ClientBin/ 224 | ~$* 225 | *~ 226 | *.dbmdl 227 | *.dbproj.schemaview 228 | *.jfm 229 | *.pfx 230 | *.publishsettings 231 | orleans.codegen.cs 232 | 233 | # Including strong name files can present a security risk 234 | # (https://github.com/github/gitignore/pull/2483#issue-259490424) 235 | #*.snk 236 | 237 | # Since there are multiple workflows, uncomment next line to ignore bower_components 238 | # (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) 239 | #bower_components/ 240 | 241 | # RIA/Silverlight projects 242 | Generated_Code/ 243 | 244 | # Backup & report files from converting an old project file 245 | # to a newer Visual Studio version. Backup files are not needed, 246 | # because we have git ;-) 247 | _UpgradeReport_Files/ 248 | Backup*/ 249 | UpgradeLog*.XML 250 | UpgradeLog*.htm 251 | ServiceFabricBackup/ 252 | *.rptproj.bak 253 | 254 | # SQL Server files 255 | *.mdf 256 | *.ldf 257 | *.ndf 258 | 259 | # Business Intelligence projects 260 | *.rdl.data 261 | *.bim.layout 262 | *.bim_*.settings 263 | *.rptproj.rsuser 264 | *- [Bb]ackup.rdl 265 | *- [Bb]ackup ([0-9]).rdl 266 | *- [Bb]ackup ([0-9][0-9]).rdl 267 | 268 | # Microsoft Fakes 269 | FakesAssemblies/ 270 | 271 | # GhostDoc plugin setting file 272 | *.GhostDoc.xml 273 | 274 | # Node.js Tools for Visual Studio 275 | .ntvs_analysis.dat 276 | node_modules/ 277 | 278 | # Visual Studio 6 build log 279 | *.plg 280 | 281 | # Visual Studio 6 workspace options file 282 | *.opt 283 | 284 | # Visual Studio 6 auto-generated workspace file (contains which files were open etc.) 285 | *.vbw 286 | 287 | # Visual Studio LightSwitch build output 288 | **/*.HTMLClient/GeneratedArtifacts 289 | **/*.DesktopClient/GeneratedArtifacts 290 | **/*.DesktopClient/ModelManifest.xml 291 | **/*.Server/GeneratedArtifacts 292 | **/*.Server/ModelManifest.xml 293 | _Pvt_Extensions 294 | 295 | # Paket dependency manager 296 | .paket/paket.exe 297 | paket-files/ 298 | 299 | # FAKE - F# Make 300 | .fake/ 301 | 302 | # CodeRush personal settings 303 | .cr/personal 304 | 305 | # Python Tools for Visual Studio (PTVS) 306 | __pycache__/ 307 | *.pyc 308 | 309 | # Cake - Uncomment if you are using it 310 | # tools/** 311 | # !tools/packages.config 312 | 313 | # Tabs Studio 314 | *.tss 315 | 316 | # Telerik's JustMock configuration file 317 | *.jmconfig 318 | 319 | # BizTalk build output 320 | *.btp.cs 321 | *.btm.cs 322 | *.odx.cs 323 | *.xsd.cs 324 | 325 | # OpenCover UI analysis results 326 | OpenCover/ 327 | 328 | # Azure Stream Analytics local run output 329 | ASALocalRun/ 330 | 331 | # MSBuild Binary and Structured Log 332 | *.binlog 333 | 334 | # NVidia Nsight GPU debugger configuration file 335 | *.nvuser 336 | 337 | # MFractors (Xamarin productivity tool) working folder 338 | .mfractor/ 339 | 340 | # Local History for Visual Studio 341 | .localhistory/ 342 | 343 | # BeatPulse healthcheck temp database 344 | healthchecksdb 345 | 346 | # Backup folder for Package Reference Convert tool in Visual Studio 2017 347 | MigrationBackup/ 348 | 349 | # Ionide (cross platform F# VS Code tools) working folder 350 | .ionide/ 351 | -------------------------------------------------------------------------------- /LICENSE: -------------------------------------------------------------------------------- 1 | MIT License 2 | 3 | Copyright (c) 2022 QuadSpinner 4 | 5 | Permission is hereby granted, free of charge, to any person obtaining a copy 6 | of this software and associated documentation files (the "Software"), to deal 7 | in the Software without restriction, including without limitation the rights 8 | to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 9 | copies of the Software, and to permit persons to whom the Software is 10 | furnished to do so, subject to the following conditions: 11 | 12 | The above copyright notice and this permission notice shall be included in all 13 | copies or substantial portions of the Software. 14 | 15 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 16 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 17 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 18 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 19 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 20 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 21 | SOFTWARE. 22 | -------------------------------------------------------------------------------- /README.md: -------------------------------------------------------------------------------- 1 | ![](images/cover-git.png) 2 | 3 | # QuadSpinner Highlighter for Visual Studio 2022 4 | 5 | An arbitrary highlighter that lets you pick individual class, parameter, or other element names to highlight across your projects. It makes it easier to find and identify objects inside your project. You can also use it for comment annotations, dividers, and more. 6 | 7 | Free download on [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=DaxPandhi.Highlighter1) 8 | 9 | **Features** 10 | - Highlight any arbitrary term 11 | - 4 different highlight shapes 12 | - Solution-scoped rules (Source control friendly) 13 | - Case sensitive and partial matches 14 | - Toggle highlights easily 15 | - Performant even on older machines and VMs 16 | 17 | > Requires Visual Studio 2022 Community Edition or higher. It should work in all text editor surfaces. 18 | 19 | ![](images/example_code.png) 20 | 21 | **You can pick any word. Highlighter does not care about its meaning to the programming language, just what is on the screen.** 22 | 23 | ## Creating Highlights 24 | 25 | ![](images/menu.png) 26 | 27 | To create a highlight, select the desired word or phrase and press `Ctrl + Num Plus`. Or you can right-click the selection and click `Create/Edit Highlight`. 28 | 29 | If the selection is an existing highlight, then you will be able to edit it. If it is a new one, you get to define its shape. 30 | 31 | ![](images/editor_new.png) 32 | 33 | You can choose the tag shape, optional blur, and color. The Highlight Editor window shows you a preview to help you choose the right shape. You can also choose whether to allow partial matches or toggle case sensitivity. 34 | 35 | The `Global Rule` option allows you to declare a rule globally across all solutions. Unchecking the option creates a rule scoped to the current solution and made portable for transport. Such rules are stored in the `~\.vs\Highlights.xml` and can be checked into source control for easy sharing. 36 | 37 | For an existing rule, you can also uncheck "Rule is Active" to disable the rule without deleting it, or select Delete to remove the permanently. 38 | 39 | ## Highlight Shapes 40 | 41 | Highlighter can create 4 different shapes, 4 option blur levels, using 40 different colors. You can also enter a hex value manually in the Options. These colors are chosen specifically to give you decent visibility whether using a dark or light theme. 42 | 43 | There are 12 built in rules for creating dividers. `//1` through `//6` and `//#` through `//######` create full line dividers. You modify these rules or make your own. 44 | 45 | | Dark | Light| 46 | | --- | --- | 47 | | ![](images/example_dark.png) | ![](images/example_light.png) | 48 | | ![](images/dividers_dark.png) | ![](images/dividers_light.png) | 49 | 50 | ## Options 51 | 52 | ![](images/options.png) 53 | 54 | The Options let you edit the rules en mass, as well as use color values not in the default palette. You can delete highlights here. 55 | 56 | --- 57 | 58 | ### Contributors 59 | 60 | @bartosz-jarmuz 61 | -------------------------------------------------------------------------------- /images/cover-git.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/QuadSpinner/Highlighter/67a45d6245e1190857b02575a0edb58dc1ac544f/images/cover-git.png -------------------------------------------------------------------------------- /images/cover.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/QuadSpinner/Highlighter/67a45d6245e1190857b02575a0edb58dc1ac544f/images/cover.png -------------------------------------------------------------------------------- /images/dividers_dark.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/QuadSpinner/Highlighter/67a45d6245e1190857b02575a0edb58dc1ac544f/images/dividers_dark.png -------------------------------------------------------------------------------- /images/dividers_light.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/QuadSpinner/Highlighter/67a45d6245e1190857b02575a0edb58dc1ac544f/images/dividers_light.png -------------------------------------------------------------------------------- /images/editor.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/QuadSpinner/Highlighter/67a45d6245e1190857b02575a0edb58dc1ac544f/images/editor.png -------------------------------------------------------------------------------- /images/editor_new.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/QuadSpinner/Highlighter/67a45d6245e1190857b02575a0edb58dc1ac544f/images/editor_new.png -------------------------------------------------------------------------------- /images/example_code.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/QuadSpinner/Highlighter/67a45d6245e1190857b02575a0edb58dc1ac544f/images/example_code.png -------------------------------------------------------------------------------- /images/example_dark.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/QuadSpinner/Highlighter/67a45d6245e1190857b02575a0edb58dc1ac544f/images/example_dark.png -------------------------------------------------------------------------------- /images/example_light.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/QuadSpinner/Highlighter/67a45d6245e1190857b02575a0edb58dc1ac544f/images/example_light.png -------------------------------------------------------------------------------- /images/menu.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/QuadSpinner/Highlighter/67a45d6245e1190857b02575a0edb58dc1ac544f/images/menu.png -------------------------------------------------------------------------------- /images/options.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/QuadSpinner/Highlighter/67a45d6245e1190857b02575a0edb58dc1ac544f/images/options.png -------------------------------------------------------------------------------- /src/Commands/CreateHighlight.cs: -------------------------------------------------------------------------------- 1 | using EnvDTE; 2 | using Highlighter.Core; 3 | using System.Linq; 4 | using System.Windows; 5 | 6 | namespace Highlighter.Commands 7 | { 8 | [Command(PackageIds.CreateHighlight)] 9 | internal sealed class CreateHighlight : BaseCommand 10 | { 11 | protected override async Task ExecuteAsync(OleMenuCmdEventArgs e) 12 | { 13 | var dte = (DTE)Microsoft.VisualStudio.Shell.Package.GetGlobalService(typeof(DTE)); 14 | string selection = (dte.ActiveDocument.Selection as TextSelection).Text; 15 | 16 | if (string.IsNullOrEmpty(selection) || string.IsNullOrWhiteSpace(selection)) 17 | return; 18 | 19 | var options = Options.GetLiveInstanceAsync().Result; 20 | options.ColorTags ??= Helper.GetFillerTags().ToArray(); 21 | 22 | var tags = options.ColorTags.ToList(); 23 | var slntags = options.SolutionTags?.ToList(); 24 | var found = tags.FirstOrDefault(x => x.Criteria == selection); 25 | bool isNew = false; 26 | bool notGlobal = false; 27 | 28 | // If tag is null, do a second search in Solution-level tags 29 | if (found == null) 30 | { 31 | try 32 | { 33 | found = slntags?.FirstOrDefault(x => x.Criteria == selection); 34 | if (found != null) 35 | notGlobal = true; 36 | } 37 | catch (Exception) 38 | { 39 | notGlobal = true; 40 | } 41 | } 42 | 43 | // No tags were found, so make a new tag 44 | isNew = found == null; 45 | 46 | found ??= new HighlightTag(selection) 47 | { 48 | Blur = Remember.LastBlur, 49 | Shape = Remember.LastShape 50 | }; 51 | 52 | // Prepare the editor 53 | var editor = new EditColor 54 | { 55 | // The tag to edit 56 | TagToEdit = found, 57 | // Is it an existing rule? 58 | btnModify = { Content = isNew ? "Create" : "Modify" }, 59 | // Allow deleting of existing rule 60 | btnDelete = { Visibility = isNew ? Visibility.Collapsed : Visibility.Visible }, 61 | // Appropriate title 62 | Title = isNew ? "Create Highlight Rule" : "Modify Highlight Rule", 63 | // Whether rule is global or not, disallow editing of existing rule 64 | chkGlobal = { IsChecked = isNew ? Remember.LastGlobal : !notGlobal, IsEnabled = isNew }, 65 | // Whether partial matches are allowed 66 | chkPartial = { IsChecked = found.AllowPartialMatch }, 67 | chkCaseSensitive = { IsChecked = found.IsCaseSensitive } 68 | }; 69 | 70 | bool result = editor.ShowDialog().Value; 71 | 72 | if (result) 73 | { 74 | if (isNew) 75 | { 76 | if (editor.chkGlobal.IsChecked == true) 77 | { 78 | // CREATE GLOBAL TAG 79 | tags.Add(editor.TagToEdit); 80 | options.ColorTags = tags.ToArray(); 81 | } 82 | else 83 | { 84 | // CREATE SOLUTION TAG 85 | slntags.Add(editor.TagToEdit); 86 | options.SolutionTags = slntags.ToArray(); 87 | } 88 | 89 | // Remember user preference 90 | Remember.LastGlobal = editor.chkGlobal.IsChecked == true; 91 | Remember.LastBlur = found.Blur; 92 | Remember.LastShape = found.Shape; 93 | } 94 | 95 | // Save to options 96 | await options.SaveAsync(); 97 | } 98 | else 99 | { 100 | // User wants to delete the rule 101 | if (editor.delete) 102 | { 103 | // Check if it is a global rule 104 | if (notGlobal) 105 | { 106 | // It is a solution-level rule 107 | slntags.Remove(found); 108 | options.SolutionTags = slntags.ToArray(); 109 | } 110 | else 111 | { 112 | // It is a global rule 113 | tags.Remove(found); 114 | options.ColorTags = tags.ToArray(); 115 | } 116 | 117 | // Save to options 118 | await options.SaveAsync(); 119 | } 120 | } 121 | } 122 | } 123 | } -------------------------------------------------------------------------------- /src/Commands/EditColor.xaml: -------------------------------------------------------------------------------- 1 |  19 | 20 | 24 | 28 | 29 | 30 | 31 | 32 | 37 | 38 | 39 | 40 | 41 | 42 | 43 | 44 | 45 | -------------------------------------------------------------------------------- /src/source.extension.cs: -------------------------------------------------------------------------------- 1 | // ------------------------------------------------------------------------------ 2 | // 3 | // This file was generated by VSIX Synchronizer 4 | // 5 | // ------------------------------------------------------------------------------ 6 | namespace Highlighter 7 | { 8 | internal sealed partial class Vsix 9 | { 10 | public const string Id = "QuadSpinner.Highlighter.4b62"; 11 | public const string Name = "Highlighter"; 12 | public const string Description = @"An arbitrary highlighter that lets you pick individual class, parameter, or other element names to highlight across your projects. It makes it easier to find and identify objects inside your project. You can also use it for comment annotations, dividers, and more."; 13 | public const string Language = "en-US"; 14 | public const string Version = "1.0.1.10"; 15 | public const string Author = "Dax Pandhi"; 16 | public const string Tags = "C#,Highlighting,Productivity,Color,Keyword,VB,CSS,HTML,Colorize,Tags,Mark"; 17 | } 18 | } 19 | -------------------------------------------------------------------------------- /src/source.extension.vsixmanifest: -------------------------------------------------------------------------------- 1 |  2 | 3 | 4 | 5 | Highlighter 6 | An arbitrary highlighter that lets you pick individual class, parameter, or other element names to highlight across your projects. It makes it easier to find and identify objects inside your project. You can also use it for comment annotations, dividers, and more. 7 | https://github.com/QuadSpinner/Highlighter 8 | License.txt 9 | https://github.com/QuadSpinner/Highlighter/ 10 | https://github.com/QuadSpinner/Highlighter/releases 11 | HighlighterPackage.ico 12 | HighlighterPackage.png 13 | C#,Highlighting,Productivity,Color,Keyword,VB,CSS,HTML,Colorize,Tags,Mark 14 | true 15 | 16 | 17 | 18 | amd64 19 | 20 | 21 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | --------------------------------------------------------------------------------