MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 02:59:33 +07:00
Code Issues Packages Projects Releases Wiki Activity

WEB-63164 HTML/Svelte/Angular: improve handling of custom language blocks in HTML parser - further refactorings

Browse Source 
GitOrigin-RevId: b70565fb014eb2ce67b6bc77ae4d28399efdeaa5
This commit is contained in:
Piotr Tomiak
2023-11-08 11:01:53 +01:00
committed by intellij-monorepo-bot
parent 82727653e1
commit 474eccd339
1 changed files with 47 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
xml/xml-psi-impl/src/com/intellij/lang/html/HtmlParsing.java
View File

@@ -85,8 +85,7 @@ public class HtmlParsing {
}
}
flushOpenItemsWhile((item) -> true);
myItemsStack.clear();
flushIncompleteItemsWhile((item) -> true);
if (error != null) {
error.error(XmlPsiBundle.message("xml.parsing.top.level.element.is.not.completed"));
@@ -95,29 +94,22 @@ public class HtmlParsing {
document.done(XmlElementType.HTML_DOCUMENT);
}
protected final void flushOpenItemsWhile(Predicate<HtmlParserStackItem> itemFilter) {
flushOpenItemsWhile(null, itemFilter);
protected final void completeTopItem() {
popItemFromStack().done(myBuilder, null, false);
}
protected final void flushOpenItemsWhile(@Nullable PsiBuilder.Marker beforeMarker, Predicate<HtmlParserStackItem> itemFilter) {
protected final void completeTopItemBefore(@Nullable PsiBuilder.Marker beforeMarker) {
popItemFromStack().done(myBuilder, beforeMarker, false);
}
protected final void flushIncompleteItemsWhile(Predicate<HtmlParserStackItem> itemFilter) {
flushIncompleteItemsWhile(null, itemFilter);
}
protected final void flushIncompleteItemsWhile(@Nullable PsiBuilder.Marker beforeMarker, Predicate<HtmlParserStackItem> itemFilter) {
while (!myItemsStack.isEmpty() && itemFilter.test(myItemsStack.peek())) {
autoCloseItem(myItemsStack.pop(), beforeMarker);
}
}
protected void autoCloseItem(@NotNull HtmlParserStackItem item, @Nullable PsiBuilder.Marker beforeMarker) {
if (item instanceof HtmlTagInfo tag) {
if (isEndTagRequired(tag)) {
if (beforeMarker != null) {
var errorMarker = beforeMarker.precede();
errorMarker.errorBefore(XmlPsiBundle.message("xml.parsing.named.element.is.not.closed", tag.getOriginalName()), beforeMarker);
} else {
error(XmlPsiBundle.message("xml.parsing.named.element.is.not.closed", tag.getOriginalName()));
}
}
doneTag(tag, beforeMarker);
} else {
throw new IllegalStateException("Support for stack item of class " + item.getClass().getName() + " is not implemented");
myItemsStack.pop().done(myBuilder, beforeMarker, true);
}
}
@@ -183,7 +175,7 @@ public class HtmlParsing {
HtmlTagInfo info = createHtmlTagInfo(originalTagName, tagStart);
while (openingTagAutoClosesTagInStack(info)) {
doneTagBefore(tagStart);
completeTopItemBefore(tagStart);
}
pushItemToStack(info);
@@ -418,10 +410,14 @@ public class HtmlParsing {
}
protected final @NotNull HtmlTagInfo peekTagInfo() {
return (HtmlTagInfo) myItemsStack.peek();
return (HtmlTagInfo)myItemsStack.peek();
}
protected void processStackItems(@NotNull Processor<? super HtmlParserStackItem> processor) {
/**
* Passes stack items starting the top of the stack to the processor.
* Processing is finished if processor returns false or whole stack has been visited
*/
protected final void processStackItems(@NotNull Processor<? super HtmlParserStackItem> processor) {
for (int i = myItemsStack.size() - 1; i >= 0; i--) {
if (!processor.process(myItemsStack.get(i))) return;
}
@@ -442,21 +438,12 @@ public class HtmlParsing {
return false;
}
protected void doneTag() {
doneTag((HtmlTagInfo)popItemFromStack(), null);
}
protected void doneTagBefore(@Nullable PsiBuilder.Marker beforeMarker) {
doneTag((HtmlTagInfo)popItemFromStack(), beforeMarker);
}
protected void doneTag(HtmlTagInfo tag, @Nullable PsiBuilder.Marker beforeMarker) {
var elementType = getHtmlTagElementType(tag, myItemsStack.size() + 1);
if (beforeMarker != null) {
tag.getStartMarker().doneBefore(elementType, beforeMarker);
} else {
tag.getStartMarker().done(elementType);
protected final void doneTag() {
if (!(peekStackItem() instanceof HtmlTagInfo)) {
throw new IllegalStateException(
"Unexpected item on stack: " + myItemsStack);
}
completeTopItem();
}
protected IElementType getHtmlTagElementType(@NotNull HtmlTagInfo info, int tagLevel) {
@@ -756,22 +743,25 @@ public class HtmlParsing {
}
public interface HtmlParserStackItem {
void done(@NotNull PsiBuilder builder, @Nullable PsiBuilder.Marker beforeMarker, boolean incomplete);
}
public interface HtmlTagInfo extends HtmlParserStackItem {
@NotNull PsiBuilder.Marker getStartMarker();
@NotNull String getNormalizedName();
@NotNull String getOriginalName();
}
protected static class HtmlTagInfoImpl implements HtmlTagInfo {
protected class HtmlTagInfoImpl implements HtmlTagInfo {
private final @NotNull String normalizedName;
private final @NotNull String originalName;
private final @NotNull PsiBuilder.Marker startMarker;
protected HtmlTagInfoImpl(@NotNull String normalizedName, @NotNull String originalName, PsiBuilder.@NotNull Marker marker) {
protected HtmlTagInfoImpl(
@NotNull String normalizedName,
@NotNull String originalName,
@NotNull PsiBuilder.Marker marker
) {
this.normalizedName = normalizedName;
this.originalName = originalName;
startMarker = marker;
@@ -788,8 +778,20 @@ public class HtmlParsing {
}
@Override
public @NotNull PsiBuilder.Marker getStartMarker() {
return startMarker;
public void done(@NotNull PsiBuilder builder, @Nullable PsiBuilder.Marker beforeMarker, boolean incomplete) {
var myElementType = getHtmlTagElementType(this, myItemsStack.size() + 1);
if (beforeMarker == null) {
if (incomplete && isEndTagRequired(this)) {
builder.error(XmlPsiBundle.message("xml.parsing.named.element.is.not.closed", getOriginalName()));
}
startMarker.done(myElementType);
} else {
if (incomplete && isEndTagRequired(this)) {
beforeMarker.precede()
.errorBefore(XmlPsiBundle.message("xml.parsing.named.element.is.not.closed", getOriginalName()), beforeMarker);
}
startMarker.doneBefore(myElementType, beforeMarker);
}
}
}
}