Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[23] Folding a markdown region hides the first line of subsequent Java #2943

Open
wants to merge 3 commits into
base: BETA_JAVA23
Choose a base branch
from
+11 −8
Open

[23] Folding a markdown region hides the first line of subsequent Java #2943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f8f65f
[23] Folding a markdown region hides the first line of subsequent Java
jarthana Sep 11, 2024
c35aebc
Fix Javadoc errors
jarthana Sep 12, 2024
e8b552b
Fix api filters
jarthana Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions org.eclipse.jdt.core.compiler.batch/.settings/.api_filters
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.jdt.core.compiler.batch" version="2">
<resource path="META-INF/MANIFEST.MF">
<filter id="931135546">
<filter id="924844039">
<message_arguments>
<message_argument value="3.39.50"/>
<message_argument value="3.38.0"/>
<message_argument value="3.39.0"/>
</message_arguments>
</filter>
</resource>
Expand Down
1 change: 0 additions & 1 deletion ...t.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/classfmt/ClassFileReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ public static ClassFileReader read(File file, boolean fullyInitialize) throws Cl
* <strong>PROVISIONAL</strong>: This has been re-introduced not to break Xtext (see
* <a href="https://github.com/eclipse/xtext/issues/3089">https://github.com/eclipse/xtext/issues/3089</a>).
*
* @author Lorenzo Bettini
*/
public static ClassFileReader read(InputStream stream, String fileName) throws ClassFormatException, IOException {
return read(Util.getInputStreamAsByteArray(stream), fileName);
Expand Down
2 changes: 1 addition & 1 deletion ...lipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/impl/JavaFeature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public enum JavaFeature {
* <dt>Individual exceptions from old rules
* <dd><ul><li>MethodScope.findField()<li>Scope.getBinding(char[], int, InvocationSite, boolean)</ul>
* <dt>Main code gen change in TypeDeclaration.manageEnclosingInstanceAccessIfNecessary()
* <dd>Only if feature is actually supported, we will generate special synthetid args & fields<br>
* <dd>Only if feature is actually supported, we will generate special synthetid args &amp; fields<br>
* Uses some feature-specific help from BlockScope.getEmulationPath()
* </dl>
*/
Expand Down
4 changes: 4 additions & 0 deletions ...eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/parser/Scanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1951,6 +1951,7 @@ protected int getNextToken0() throws InvalidInputException {
}
}
if (!lineBeginsWithMarkdown()) {
this.currentPosition--;
break;
}
}
Expand Down Expand Up @@ -1984,6 +1985,7 @@ protected int getNextToken0() throws InvalidInputException {
}
}
if (!lineBeginsWithMarkdown()) {
this.currentPosition--;
break;
}
}
Expand Down Expand Up @@ -2848,6 +2850,7 @@ public final void jumpOverMethodBody() {
}
}
if (!lineBeginsWithMarkdown()) {
this.currentPosition--;
break;
}
}
Expand Down Expand Up @@ -2881,6 +2884,7 @@ public final void jumpOverMethodBody() {
}
}
if (!lineBeginsWithMarkdown()) {
this.currentPosition--;
break;
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...sts.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/MarkdownCommentsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ public void test012() {
"""
public class X {
/// Some text here without the necessary tags for main method
/// @param arguments
/// @param arguments\s

// This line will be ignored and the previous block will be considered as the Javadoc
public static void main(String[] arguments) {
Expand All @@ -364,7 +364,7 @@ public static void main(String[] arguments) {
""", },
"----------\n" +
"1. WARNING in X.java (at line 3)\n" +
" /// @param arguments\n" +
" /// @param arguments \n" +
" ^^^^^^^^^\n" +
"Javadoc: Description expected after this reference\n" +
"----------\n");
Expand Down
4 changes: 2 additions & 2 deletions org.eclipse.jdt.core/.settings/.api_filters
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.jdt.core" version="2">
<resource path="META-INF/MANIFEST.MF">
<filter id="931135546">
<filter id="924844039">
<message_arguments>
<message_argument value="3.39.50"/>
<message_argument value="3.38.0"/>
<message_argument value="3.39.0"/>
</message_arguments>
</filter>
</resource>
Expand Down