// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.lexer;

import com.intellij.html.embedding.HtmlEmbedment;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.xml.XmlTokenType;
import org.jetbrains.annotations.NotNull;

import static com.intellij.util.ObjectUtils.notNull;

/**
 * @author Maxim.Mossienko
 */
public class HtmlLexer extends BaseHtmlLexer {

  private IElementType myTokenType;
  private int myTokenStart;
  private int myTokenEnd;


  public HtmlLexer() {
    this(new MergingLexerAdapter(new FlexAdapter(new _HtmlLexer()), TOKENS_TO_MERGE), true);
  }

  protected HtmlLexer(@NotNull Lexer baseLexer, boolean caseInsensitive) {
    super(baseLexer, caseInsensitive);
  }

  @Override
  public void start(@NotNull CharSequence buffer, int startOffset, int endOffset, int initialState) {
    myTokenType = null;
    super.start(buffer, startOffset, endOffset, initialState);
  }

  @Override
  public void advance() {
    myTokenType = null;
    super.advance();
  }

  @Override
  public IElementType getTokenType() {
    if (myTokenType != null) return myTokenType;
    IElementType tokenType = super.getTokenType();

    myTokenStart = super.getTokenStart();
    myTokenEnd = super.getTokenEnd();

    HtmlEmbedment embedment = acquireHtmlEmbedmentInfo();
    if (embedment != null) {
      skipEmbedment(embedment);
      myTokenEnd = embedment.getRange().getEndOffset();
      myTokenType = notNull(embedment.getElementType(), XmlTokenType.XML_DATA_CHARACTERS);
    } else {
      myTokenType = tokenType;
    }
    return myTokenType;
  }

  @Override
  public int getTokenStart() {
    if (myTokenType != null) {
      return myTokenStart;
    }
    return super.getTokenStart();
  }

  @Override
  public int getTokenEnd() {
    if (myTokenType != null) {
      return myTokenEnd;
    }
    return super.getTokenEnd();
  }
}

@@ -352,52 +352,25 @@
 ort 
-static com.intellij.util.ObjectUtils.notNull
+java.util.Objects
 ;%0A%0A/
@@ -1509,15 +1509,34 @@
 e = 
-notNull
+Objects.requireNonNullElse
 (emb

use Objects.requireNonNull