Psi/XmlDocBlockNodeType: move from FSharpTokenType (#517)

Author: DedSec256

ReSharper.FSharp/src/FSharp.Psi.Features/src/Parsing/FSharpImplTreeBuilder.fs

@@ -7,6 +7,7 @@ open FSharp.Compiler.SyntaxTrivia
 open FSharp.Compiler.Text
 open JetBrains.Diagnostics
 open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Parsing
+open JetBrains.ReSharper.Plugins.FSharp.Psi.Impl.DocComments
 open JetBrains.ReSharper.Plugins.FSharp.Psi.Impl.Tree
 open JetBrains.ReSharper.Plugins.FSharp.Psi.Parsing
 open JetBrains.ReSharper.Plugins.FSharp.Util
@@ -179,7 +180,7 @@ type FSharpImplTreeBuilder(lexer, document, decls, lifetime, path, projectedOffs
             let mark =
                 if xmlDoc.HasDeclaration then
                     let mark = x.Mark(xmlDoc.Range)
-                    x.MarkAndDone(xmlDoc.Range, FSharpTokenType.XML_DOC_BLOCK)
+                    x.MarkAndDone(xmlDoc.Range, DocCommentBlockNodeType.Instance)
                     mark
                 else x.Mark()
 

ReSharper.FSharp/src/FSharp.Psi.Features/src/Parsing/FSharpTreeBuilderBase.fs

@@ -11,6 +11,7 @@ open JetBrains.Application.Environment.Helpers
 open JetBrains.Diagnostics
 open JetBrains.DocumentModel
 open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Parsing.FcsSyntaxTreeUtil
+open JetBrains.ReSharper.Plugins.FSharp.Psi.Impl.DocComments
 open JetBrains.ReSharper.Plugins.FSharp.Psi.Impl.Tree
 open JetBrains.ReSharper.Plugins.FSharp.Psi.Parsing
 open JetBrains.ReSharper.Plugins.FSharp.Psi.Tree
@@ -126,7 +127,7 @@ type FSharpTreeBuilderBase(lexer, document: IDocument, lifetime, path: VirtualFi
     member x.MarkXmlDocOwner(xmlDoc: XmlDoc, expectedType: TokenNodeType, declarationRange: range) =
         let mark = x.MarkTokenOrRange(expectedType, declarationRange)
         if xmlDoc.HasDeclaration then
-            x.MarkAndDone(xmlDoc.Range, FSharpTokenType.XML_DOC_BLOCK)
+            x.MarkAndDone(xmlDoc.Range, DocCommentBlockNodeType.Instance)
         mark
 
     member x.ProcessReferenceName(lid: Ident list) =

ReSharper.FSharp/src/FSharp.Psi/src/CodeFormatter/FSharpCodeFormatterInfoProvider.cs

@@ -7,6 +7,7 @@
 using JetBrains.Application.Threading;
 using JetBrains.Lifetimes;
 using JetBrains.ProjectModel;
+using JetBrains.ReSharper.Plugins.FSharp.Psi.Impl.DocComments;
 using JetBrains.ReSharper.Plugins.FSharp.Psi.Impl.Tree;
 using JetBrains.ReSharper.Plugins.FSharp.Psi.Parsing;
 using JetBrains.ReSharper.Plugins.FSharp.Psi.Tree;
@@ -144,7 +145,7 @@ private void Indenting()
         .Name("ContinuousIndent")
         .Where(Node().In(continuousIndentNodes.Union(ElementType.PREFIX_APP_EXPR)).Satisfies((node, _) =>
           node.Node is not IPrefixAppExpr || node.Parent.NodeOrNull is not IPrefixAppExpr))
-        .AddException(Node().In(ElementType.ATTRIBUTE_LIST, FSharpTokenType.XML_DOC_BLOCK))
+        .AddException(Node().In(ElementType.ATTRIBUTE_LIST, DocCommentBlockNodeType.Instance))
         .AddException(Node().In(FSharpTokenType.LINE_COMMENT).Satisfies((node, _) => node.NodeOrNull is DocComment))
         .AddException(
           // todo: add setting

ReSharper.FSharp/src/FSharp.Psi/src/Impl/DocComments/XmlDocBlock.cs

@@ -0,0 +1,17 @@
+using JetBrains.ReSharper.Plugins.FSharp.Psi.Impl.Tree;
+using JetBrains.ReSharper.Plugins.FSharp.Psi.Tree;
+using JetBrains.ReSharper.Psi.ExtensionsAPI.Tree;
+
+namespace JetBrains.ReSharper.Plugins.FSharp.Psi.Impl.DocComments
+{
+  public class DocCommentBlockNodeType : FSharpCompositeNodeType
+  {
+    public static readonly CompositeNodeType Instance = new DocCommentBlockNodeType();
+
+    private DocCommentBlockNodeType() : base("XML_DOC_BLOCK", 1900)
+    {
+    }
+
+    public override CompositeElement Create() => new XmlDocBlock();
+  }
+}

ReSharper.FSharp/src/FSharp.Psi/src/Impl/Tree/FSharpComment.cs

@@ -1,4 +1,5 @@
 using JetBrains.Annotations;
+using JetBrains.ReSharper.Plugins.FSharp.Psi.Impl.DocComments;
 using JetBrains.ReSharper.Plugins.FSharp.Psi.Parsing;
 using JetBrains.ReSharper.Psi;
 using JetBrains.ReSharper.Psi.ExtensionsAPI.Tree;
@@ -99,6 +100,6 @@ public DocComment([NotNull] TokenNodeType nodeType, [NotNull] string text) : bas
   public partial class XmlDocBlock : FSharpCompositeElement
   {
     public override bool IsFiltered() => true;
-    public override NodeType NodeType => FSharpTokenType.XML_DOC_BLOCK;
+    public override NodeType NodeType => DocCommentBlockNodeType.Instance;
   }
 }

ReSharper.FSharp/src/FSharp.Psi/src/Parsing/FSharpTokenType.cs

@@ -134,15 +134,6 @@ public BlockCommentNodeType(int nodeTypeIndex) : base("BLOCK_COMMENT", nodeTypeI
       public override LeafElementBase Create(string text) => new FSharpComment(this, text);
     }
 
-    private sealed class XmlDocBlockNodeType : FSharpCompositeNodeType
-    {
-      public XmlDocBlockNodeType(int nodeTypeIndex) : base("XML_DOC_BLOCK", nodeTypeIndex)
-      {
-      }
-
-      public override CompositeElement Create() => new XmlDocBlock();
-    }
-
     public const int WHITESPACE_NODE_TYPE_INDEX = LAST_GENERATED_TOKEN_TYPE_INDEX + 1;
     public static readonly TokenNodeType WHITESPACE = new WhitespaceNodeType(WHITESPACE_NODE_TYPE_INDEX);
 
@@ -158,9 +149,6 @@ public XmlDocBlockNodeType(int nodeTypeIndex) : base("XML_DOC_BLOCK", nodeTypeIn
     public const int CHAMELEON_NODE_TYPE_INDEX = LAST_GENERATED_TOKEN_TYPE_INDEX + 5;
     public static readonly TokenNodeType CHAMELEON = new FSharpTokenNodeType("CHAMELEON", CHAMELEON_NODE_TYPE_INDEX);
 
-    public const int XML_DOC_BLOCK_NODE_TYPE_INDEX = LAST_GENERATED_TOKEN_TYPE_INDEX + 6;
-    public static readonly CompositeNodeType XML_DOC_BLOCK = new XmlDocBlockNodeType(XML_DOC_BLOCK_NODE_TYPE_INDEX);
-
     public static readonly NodeTypeSet RightBraces;
     public static readonly NodeTypeSet LeftBraces;
     public static readonly NodeTypeSet AccessModifiersKeywords;