src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TagletWriterImpl.java

*** 70,79 ****
--- 70,80 ----
  
  public class TagletWriterImpl extends TagletWriter {
  
      private final HtmlDocletWriter htmlWriter;
      private final HtmlConfiguration configuration;
+     private final HtmlOptions options;
      private final Utils utils;
      private final boolean inSummary;
      private final Resources resources;
  
      public TagletWriterImpl(HtmlDocletWriter htmlWriter, boolean isFirstSentence) {
*** 81,93 ****
      }
  
      public TagletWriterImpl(HtmlDocletWriter htmlWriter, boolean isFirstSentence, boolean inSummary) {
          super(isFirstSentence);
          this.htmlWriter = htmlWriter;
-         configuration = htmlWriter.configuration;
-         this.utils = configuration.utils;
          this.inSummary = inSummary;
          resources = configuration.getResources();
      }
  
      /**
       * {@inheritDoc}
--- 82,95 ----
      }
  
      public TagletWriterImpl(HtmlDocletWriter htmlWriter, boolean isFirstSentence, boolean inSummary) {
          super(isFirstSentence);
          this.htmlWriter = htmlWriter;
          this.inSummary = inSummary;
+         configuration = htmlWriter.configuration;
+         options = configuration.getOptions();
+         utils = configuration.utils;
          resources = configuration.getResources();
      }
  
      /**
       * {@inheritDoc}
*** 426,436 ****
                      .compute(anchorName, (k, v) -> v == null ? 0 : v + 1);
              if (count > 0) {
                  anchorName += "-" + count;
              }
              result = HtmlTree.SPAN(anchorName, HtmlStyle.searchTagResult, new StringContent(tagText));
!             if (configuration.createindex && !tagText.isEmpty()) {
                  SearchIndexItem si = new SearchIndexItem();
                  si.setSystemProperty(isSystemProperty);
                  si.setLabel(tagText);
                  si.setDescription(desc);
                  si.setUrl(htmlWriter.path.getPath() + "#" + anchorName);
--- 428,438 ----
                      .compute(anchorName, (k, v) -> v == null ? 0 : v + 1);
              if (count > 0) {
                  anchorName += "-" + count;
              }
              result = HtmlTree.SPAN(anchorName, HtmlStyle.searchTagResult, new StringContent(tagText));
!             if (options.createIndex && !tagText.isEmpty()) {
                  SearchIndexItem si = new SearchIndexItem();
                  si.setSystemProperty(isSystemProperty);
                  si.setLabel(tagText);
                  si.setDescription(desc);
                  si.setUrl(htmlWriter.path.getPath() + "#" + anchorName);