diff options
| author | Aaron Bockover <abock@microsoft.com> | 2019-07-29 19:40:39 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-29 19:40:39 +0300 |
| commit | 4e737edae0176a621e7a256ada45691322b0774c (patch) | |
| tree | e627ce9df5ad69646f1d38f2061fc3a294bc44b4 | |
| parent | 5a8dda4e6daabe1182f28562b0ae894a137a24f4 (diff) | |
| parent | 026f6d97b02631a8e4f943264ffae67e828c529f (diff) | |
Merge pull request #8291 from mono/pr-sandy-taskmaster
Editor: Add TaskTagger so TODOs get highlighted
3 files changed, 6 insertions, 2 deletions
diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/MonoDevelop.TextEditor.Cocoa.csproj b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/MonoDevelop.TextEditor.Cocoa.csproj index bf5ebd78f9..afa23fc1ca 100644 --- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/MonoDevelop.TextEditor.Cocoa.csproj +++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/MonoDevelop.TextEditor.Cocoa.csproj @@ -63,6 +63,7 @@ <ProjectReference Include="$(VSEditorCoreDirectory)src\Editor\Text\Impl\VisibleWhitespace\VisibleWhitespaceImpl.csproj" Private="True" /> <ProjectReference Include="$(VSEditorCoreDirectory)src\Editor\Text\Impl\GlyphMargin\GlyphMarginImpl.csproj" Private="True" /> <ProjectReference Include="$(VSEditorCoreDirectory)src\Editor\Text\Impl\Structure\StructureImpl.csproj" Private="true" /> + <ProjectReference Include="$(VSEditorCoreDirectory)src\Editor\Text\Impl\TaskTagger\TaskTagger.csproj" Private="true" /> <ProjectReference Include="$(VSEditorCoreDirectory)src\Editor\Text\Impl\UrlTagger\UrlTagger.csproj" Private="true" /> <ProjectReference Include="$(VSEditorCoreDirectory)src\Editor\Text\Impl\DragDrop\DragDropImpl.csproj" Private="True" /> <ProjectReference Include="$(VSEditorCoreDirectory)src\Editor\Text\Impl\ChangeTagger\ChangeTagger.csproj" Private="True" /> @@ -97,6 +98,7 @@ <IncludeCopyLocal Include="Microsoft.VisualStudio.UI.Text.Wpf.GlyphMargin.Implementation.dll" /> <IncludeCopyLocal Include="Microsoft.VisualStudio.UI.Text.AdornmentLibrary.VisibleWhitespace.Implementation.dll" /> <IncludeCopyLocal Include="Microsoft.VisualStudio.UI.Text.CurrentLineHighlighter.Implementation.dll" /> + <IncludeCopyLocal Include="Microsoft.VisualStudio.Logic.Text.TaskTagger.Implementation.dll" /> <IncludeCopyLocal Include="Microsoft.VisualStudio.Logic.Text.UrlTagger.Implementation.dll" /> <IncludeCopyLocal Include="Microsoft.VisualStudio.UI.Text.Cocoa.DragDrop.Implementation.dll" /> <IncludeCopyLocal Include="Microsoft.VisualStudio.Logic.Text.ChangeTagger.Implementation.dll" /> diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/Properties/MonoDevelop.TextEditor.Cocoa.addin.xml b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/Properties/MonoDevelop.TextEditor.Cocoa.addin.xml index 49668b7ccb..3cbda1c2bc 100644 --- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/Properties/MonoDevelop.TextEditor.Cocoa.addin.xml +++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/Properties/MonoDevelop.TextEditor.Cocoa.addin.xml @@ -32,7 +32,7 @@ <Import assembly="Microsoft.VisualStudio.UI.Controls.macOS.dll" /> </Runtime> <Extension path="/MonoDevelop/Ide/Composition"> - <!-- These are coming from vs-editor-api (no Cocoa dependency) --> + <!-- these are coming from vs-editor-core (Cocoa implementations) --> <Assembly file="Microsoft.CodeAnalysis.EditorFeatures.Cocoa.dll" /> <Assembly file="Microsoft.VisualStudio.Language.StandardClassification.Implementation.dll" /> <Assembly file="Microsoft.VisualStudio.Logic.Text.Navigation.NavigationProviders.dll" /> @@ -49,8 +49,9 @@ <Assembly file="Microsoft.VisualStudio.UI.Text.Wpf.GlyphMargin.Implementation.dll" /> <Assembly file="Microsoft.VisualStudio.UI.Text.Cocoa.DragDrop.Implementation.dll" /> <Assembly file="Microsoft.VisualStudio.Logic.Text.ChangeTagger.Implementation.dll" /> + <Assembly file="Microsoft.VisualStudio.Logic.Text.TaskTagger.Implementation.dll" /> <Assembly file="MonoDevelop.TextEditor.Cocoa.dll" /> - <!-- these are coming from vs-editor-core (Cocoa implementations) --> + <!-- These are coming from vs-editor-api (no Cocoa dependency) --> <Assembly file="../../../bin/Microsoft.VisualStudio.CoreUtilityImplementation.dll" /> <Assembly file="../../../bin/Microsoft.VisualStudio.Editor.Imaging.dll" /> <Assembly file="../../../bin/Microsoft.VisualStudio.Language.Implementation.dll" /> diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/ThemeToClassification.cs b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/ThemeToClassification.cs index e9e9afa34e..462d3831b3 100644 --- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/ThemeToClassification.cs +++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/ThemeToClassification.cs @@ -168,6 +168,7 @@ namespace MonoDevelop.TextEditor ("HTML Operator", "HTML Operator"), ("HTML Server-Side Script", "HTML Server-Side Script"), ("HTML Tag Delimiter", "HTML Tag Delimiter"), + ("taskformat", "Comment Tags"), }; void UpdateEditorFormatMap (object sender, EventArgs args) |