-
Notifications
You must be signed in to change notification settings - Fork 87
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'eclipse-jdt:master' into feature/foldingStrucktur
- Loading branch information
Showing
77 changed files
with
2,669 additions
and
238 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
121 changes: 121 additions & 0 deletions
121
...ion/common/org/eclipse/jdt/core/manipulation/internal/javadoc/CoreMarkdownAccessImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2024 GK Software SE and others. | ||
| * | ||
| * This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License 2.0 | ||
| * which accompanies this distribution, and is available at | ||
| * https://www.eclipse.org/legal/epl-2.0/ | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * | ||
| * Contributors: | ||
| * Stephan Herrmann - Initial API and implementation | ||
| *******************************************************************************/ | ||
| package org.eclipse.jdt.core.manipulation.internal.javadoc; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Arrays; | ||
| import java.util.List; | ||
|
|
||
| import org.commonmark.Extension; | ||
| import org.commonmark.ext.gfm.tables.TablesExtension; | ||
| import org.commonmark.node.Document; | ||
| import org.commonmark.node.Node; | ||
| import org.commonmark.node.Paragraph; | ||
| import org.commonmark.parser.Parser; | ||
| import org.commonmark.renderer.html.HtmlRenderer; | ||
|
|
||
| import org.eclipse.jdt.core.IJavaElement; | ||
| import org.eclipse.jdt.core.dom.ASTNode; | ||
| import org.eclipse.jdt.core.dom.Javadoc; | ||
| import org.eclipse.jdt.core.dom.TagElement; | ||
| import org.eclipse.jdt.core.dom.TextElement; | ||
|
|
||
| public class CoreMarkdownAccessImpl extends CoreJavadocAccessImpl { | ||
|
|
||
| private Parser fParser; | ||
| private HtmlRenderer fRenderer; | ||
| private int fBlockDepth= 0; | ||
|
|
||
| public CoreMarkdownAccessImpl(IJavaElement element, Javadoc javadoc, String source) { | ||
| super(element, javadoc, source); | ||
| init(); | ||
| } | ||
| public CoreMarkdownAccessImpl(IJavaElement element, Javadoc javadoc, String source, JavadocLookup lookup) { | ||
| super(element, javadoc, source, lookup); | ||
| init(); | ||
| } | ||
|
|
||
| private void init() { | ||
| List<Extension> extensions= List.of(TablesExtension.create()); | ||
| fParser= Parser.builder().extensions(extensions).build(); | ||
| fRenderer= HtmlRenderer.builder().extensions(extensions).build(); | ||
| } | ||
|
|
||
| @Override | ||
| protected String removeDocLineIntros(String textWithSlashes) { | ||
| String lineBreakGroup= "(\\r\\n?|\\n)"; //$NON-NLS-1$ | ||
| String noBreakSpace= "[^\r\n&&\\s]"; //$NON-NLS-1$ | ||
| // in the markdown case relevant leading whitespace is contained in TextElements, no need to preserve blanks *between* elements | ||
| return textWithSlashes.replaceAll(lineBreakGroup + noBreakSpace + "*///" + noBreakSpace + '*', "$1"); //$NON-NLS-1$ //$NON-NLS-2$ | ||
| } | ||
|
|
||
| @Override | ||
| protected void handleLink(List<? extends ASTNode> fragments) { | ||
| if (fragments.size() == 2 && fragments.get(0) instanceof TextElement) { | ||
| // super method expects the reference as first fragment, optional label as second fragment | ||
| fragments= Arrays.asList(fragments.get(1), fragments.get(0)); | ||
| } | ||
| super.handleLink(fragments); | ||
| } | ||
|
|
||
| @Override | ||
| protected String getBlockTagStart() { | ||
| this.fBlockDepth++; | ||
| return "\n"+super.getBlockTagStart(); //$NON-NLS-1$ | ||
| } | ||
|
|
||
| @Override | ||
| protected String getBlockTagEnd() { | ||
| if (this.fBlockDepth > 0) | ||
| this.fBlockDepth--; | ||
| return super.getBlockTagEnd(); | ||
| } | ||
|
|
||
| @Override | ||
| protected void handleContentElements(List<? extends ASTNode> nodes, boolean skipLeadingWhitespace, TagElement tagElement) { | ||
| int start= fBuf.length(); | ||
| super.handleContentElements(nodes, skipLeadingWhitespace, tagElement); | ||
| if (this.fBlockDepth > 0) { | ||
| // inside an HTML block the markdown content must be rendered now | ||
| String generated= fBuf.substring(start); // extract new part of fBuf | ||
| Node node= fParser.parse(generated); | ||
| if (node.getFirstChild() instanceof Paragraph para && para.getNext() == null) { | ||
| // inside block replace single paragraph with its children | ||
| node= eliminateContainerNode(para); | ||
| } | ||
| String rendered= fRenderer.render(node); | ||
| fBuf.replace(start, fBuf.length(), rendered); // replace new part with its rendered version | ||
| } | ||
| } | ||
|
|
||
| /** Return a new Document containing all children of the given container node. */ | ||
| protected Node eliminateContainerNode(Node container) { | ||
| List<Node> children= new ArrayList<>(); | ||
| for (Node child= container.getFirstChild(); child != null; child= child.getNext()) { | ||
| children.add(child); | ||
| } | ||
| Document doc= new Document(); | ||
| for (Node child2 : children) { | ||
| doc.appendChild(child2); | ||
| } | ||
| return doc; | ||
| } | ||
|
|
||
| @Override | ||
| public String toHTML() { | ||
| String content= super.toHTML(); | ||
| Node document= fParser.parse(content); | ||
| return fRenderer.render(document); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
...eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/CleanUpNLSUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2024 Red Hat Inc. and others. | ||
| * | ||
| * This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License 2.0 | ||
| * which accompanies this distribution, and is available at | ||
| * https://www.eclipse.org/legal/epl-2.0/ | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * | ||
| * Contributors: | ||
| * Red Hat Inc. - initial API and implementation | ||
| *******************************************************************************/ | ||
| package org.eclipse.jdt.internal.ui.fix; | ||
|
|
||
| import org.eclipse.jface.text.BadLocationException; | ||
|
|
||
| import org.eclipse.jdt.core.ICompilationUnit; | ||
| import org.eclipse.jdt.core.JavaModelException; | ||
| import org.eclipse.jdt.core.compiler.InvalidInputException; | ||
| import org.eclipse.jdt.core.dom.ASTNode; | ||
| import org.eclipse.jdt.core.dom.CompilationUnit; | ||
|
|
||
| import org.eclipse.jdt.internal.corext.refactoring.nls.NLSLine; | ||
| import org.eclipse.jdt.internal.corext.refactoring.nls.NLSScanner; | ||
|
|
||
| public class CleanUpNLSUtils { | ||
|
|
||
| public static NLSLine scanCurrentLine(ICompilationUnit cu, ASTNode exp) { | ||
| CompilationUnit cUnit= (CompilationUnit)exp.getRoot(); | ||
| int startLine= cUnit.getLineNumber(exp.getStartPosition()); | ||
| int lineStart= cUnit.getPosition(startLine, 0); | ||
| int endOfLine= cUnit.getPosition(startLine + 1, 0); | ||
| NLSLine[] lines; | ||
| try { | ||
| lines= NLSScanner.scan(cu.getBuffer().getText(lineStart, endOfLine - lineStart)); | ||
| if (lines.length > 0) { | ||
| return lines[0]; | ||
| } | ||
| } catch (IndexOutOfBoundsException | JavaModelException | InvalidInputException | BadLocationException e) { | ||
| e.printStackTrace(); | ||
| // fall-through | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.