Skip to content

Commit

Permalink
Merge pull request #8002 from apache/delivery
Browse files Browse the repository at this point in the history 
Sync delivery to release240 for 24-rc5
  • Loading branch information
@ebarboni
ebarboni authored Nov 29, 2024
2 parents 212f4c3 + ffe785c commit 6308a54
Show file tree
Hide file tree
Showing 12 changed files with 50 additions and 327 deletions.
22 changes: 4 additions & 18 deletions ...rise/micronaut/src/org/netbeans/modules/micronaut/hints/MicronautConfigErrorProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,9 @@ public void run(ResultIterator it) throws Exception {
scan(text, scanner.scan((ParserResult) result), structure -> {
int start = (int) structure.getPosition();
int end = (int) structure.getEndPosition();
String[] startLines = text.substring(0, start).split("\n");
String[] endLines = text.substring(0, end).split("\n");
diags.add(Diagnostic.Builder.create(() -> start, () -> end, Bundle.ERR_PropertyWithoutValue())
.setSeverity(Diagnostic.Severity.Warning)
.setCode(ERR_CODE_PREFIX + startLines.length + ',' + (startLines[startLines.length - 1].length() + 1) + '-' + endLines.length + ',' + (endLines[endLines.length - 1].length() + 1))
.setCode(ERR_CODE_PREFIX + text.substring(0, start).split("\n").length)
.build());
});
}
Expand All @@ -137,7 +135,7 @@ public void run(ResultIterator it) throws Exception {
int end = offset + line.length();
diags.add(Diagnostic.Builder.create(() -> start, () -> end, Bundle.ERR_PropertyWithoutValue())
.setSeverity(Diagnostic.Severity.Warning)
.setCode(ERR_CODE_PREFIX + (i + 1) + ",1-" + (i + 1) + "," + line.length() + 1)
.setCode(ERR_CODE_PREFIX + (i + 1))
.build());
}
}
Expand Down Expand Up @@ -200,26 +198,14 @@ public int getIndexVersion() {
}
}

private static final class ErrorConvertorImpl implements ErrorsCache.Convertor2<Diagnostic> {
private static final class ErrorConvertorImpl implements ErrorsCache.Convertor<Diagnostic> {
@Override
public ErrorsCache.ErrorKind getKind(Diagnostic t) {
return t.getSeverity() == Diagnostic.Severity.Error ? ErrorsCache.ErrorKind.ERROR : ErrorsCache.ErrorKind.WARNING;
}
@Override
public int getLineNumber(Diagnostic t) {
String text = t.getCode().substring(ERR_CODE_PREFIX.length());
int idx = text.indexOf(',');
return Integer.parseInt(text.substring(0, idx));
}
@Override
public ErrorsCache.Range getRange(Diagnostic t) {
String text = t.getCode().substring(ERR_CODE_PREFIX.length());
int idx1 = text.indexOf(',');
int idx2 = text.indexOf('-');
int idx3 = text.indexOf(',', idx2);
ErrorsCache.Position start = new ErrorsCache.Position(Integer.parseInt(text.substring(0, idx1)), Integer.parseInt(text.substring(idx1 + 1, idx2)));
ErrorsCache.Position end = new ErrorsCache.Position(Integer.parseInt(text.substring(idx2 + 1, idx3)), Integer.parseInt(text.substring(idx3 + 1, text.length())));
return new ErrorsCache.Range(start, end);
return Integer.parseInt(t.getCode().substring(ERR_CODE_PREFIX.length()));
}
@Override
public String getMessage(Diagnostic t) {
Expand Down
27 changes: 2 additions & 25 deletions ide/csl.api/src/org/netbeans/modules/csl/core/TLIndexerFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
import org.netbeans.modules.parsing.spi.indexing.EmbeddingIndexer;
import org.netbeans.modules.parsing.spi.indexing.EmbeddingIndexerFactory;
import org.netbeans.modules.parsing.spi.indexing.ErrorsCache;
import org.netbeans.modules.parsing.spi.indexing.ErrorsCache.Convertor2;
import org.netbeans.modules.parsing.spi.indexing.ErrorsCache.Convertor;
import org.netbeans.modules.parsing.spi.indexing.ErrorsCache.ErrorKind;
import org.netbeans.modules.parsing.spi.indexing.Indexable;
import org.netbeans.spi.tasklist.TaskScanningScope;
Expand Down Expand Up @@ -141,7 +141,7 @@ public int getIndexVersion () {
return INDEXER_VERSION;
}

private static final class ErrorConvertorImpl implements Convertor2<SimpleError>{
private static final class ErrorConvertorImpl implements Convertor<SimpleError>{
private final List<Integer> lineStartOffsets;
public ErrorConvertorImpl(List<Integer> lineStartOffsets) {
this.lineStartOffsets = lineStartOffsets;
Expand Down Expand Up @@ -178,29 +178,6 @@ public int getLineNumber(SimpleError error) {
return lineNumber;
}
@Override
public ErrorsCache.Range getRange(SimpleError error) {
int originalOffset = error.getStartPosition(); //snapshot offset
int lineNumber = 1;
int colNumber = 1;
if (originalOffset >= 0) {
int idx = Collections.binarySearch(lineStartOffsets, originalOffset);
if (idx < 0) {
// idx == (-(insertion point) - 1) -> (insertion point) == -idx - 1
int ln = -idx - 1;
assert ln >= 1 && ln <= lineStartOffsets.size() :
"idx=" + idx + ", lineNumber=" + ln + ", lineStartOffsets.size()=" + lineStartOffsets.size(); //NOI18N
if (ln >= 1 && ln <= lineStartOffsets.size()) {
lineNumber = ln;
colNumber = originalOffset - lineStartOffsets.get(ln - 1);
}
} else {
lineNumber = idx + 1;
}
}

return new ErrorsCache.Range(new ErrorsCache.Position(lineNumber, colNumber), null);
}
@Override
public String getMessage(SimpleError error) {
return error.getDisplayName();
}
Expand Down
14 changes: 0 additions & 14 deletions ide/parsing.indexing/apichanges.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,20 +87,6 @@ is the proper place.
<!-- ACTUAL CHANGES BEGIN HERE: -->

<changes>
<change id="ErrorsCache.getErrors">
<api name="IndexingAPI"/>
<summary>Added method to ErrorsCache to return all errors or warnings for the given file</summary>
<version major="9" minor="37"/>
<date day="6" month="9" year="2024"/>
<author login="dbalek"/>
<compatibility source="compatible" binary="compatible" semantic="compatible" addition="yes"/>
<description>
<p>
Added the <a href="@TOP@/org/netbeans/modules/parsing/spi/indexing/ErrorsCache.html#getErrors-org.openide.filesystems.FileObject-org.netbeans.modules.parsing.spi.indexing.ErrorsCache.ReverseConvertor-">getErrors()</a> method to return errors or warnings for the given file.
</p>
</description>
<class package="org.netbeans.modules.parsing.spi.indexing" name="ErrorsCache"/>
</change>
<change id="ErrorsCache.getAllFilesWithRecord">
<api name="IndexingAPI"/>
<summary>Added method to ErrorsCache to return all files with error or warning</summary>
Expand Down
2 changes: 1 addition & 1 deletion ide/parsing.indexing/nbproject/project.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# under the License.
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
spec.version.base=9.37.0
spec.version.base=9.36.0
is.autoload=true
javadoc.apichanges=${basedir}/apichanges.xml
javadoc.arch=${basedir}/arch.xml
82 changes: 22 additions & 60 deletions ide/parsing.indexing/src/org/netbeans/modules/parsing/impl/indexing/errors/TaskCache.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.api.java.classpath.ClassPath;
import org.netbeans.api.project.FileOwnerQuery;
Expand All @@ -55,11 +53,8 @@
import org.netbeans.modules.parsing.impl.indexing.PathRegistry;
import org.netbeans.modules.parsing.impl.indexing.URLCache;
import org.netbeans.modules.parsing.impl.indexing.implspi.CacheFolderProvider;
import org.netbeans.modules.parsing.spi.indexing.ErrorsCache;
import org.netbeans.modules.parsing.spi.indexing.ErrorsCache.Convertor;
import org.netbeans.modules.parsing.spi.indexing.ErrorsCache.Convertor2;
import org.netbeans.modules.parsing.spi.indexing.ErrorsCache.ErrorKind;
import org.netbeans.modules.parsing.spi.indexing.ErrorsCache.ReverseConvertor;
import org.netbeans.modules.parsing.spi.indexing.Indexable;
import org.netbeans.spi.tasklist.Task;
import org.openide.filesystems.FileObject;
Expand All @@ -82,8 +77,6 @@ public class TaskCache {

private static final Logger LOG = Logger.getLogger(TaskCache.class.getName());

private static final Pattern PATTERN = Pattern.compile("(\\d*),(\\d*)(?:-(\\d*),(\\d*))?");

static {
// LOG.setLevel(Level.FINEST);
}
Expand All @@ -110,31 +103,17 @@ private String getTaskType( ErrorKind k ) {
}
return null;
}

private ReverseConvertor<Task> getTaskConvertor(FileObject file) {
return (kind, range, message) -> {
String severity = getTaskType(kind);
if (null != severity) {
return Task.create(file, severity, message, range.getStart().getLine());
}
return null;
};
}


public List<Task> getErrors(FileObject file) {
return getErrors(file, getTaskConvertor(file));
}

public <T> List<T> getErrors(FileObject file, ReverseConvertor<T> convertor) {
List<T> result = new LinkedList<>();
List<Task> result = new LinkedList<Task>();

result.addAll(getErrors(file, convertor, ERR_EXT));
result.addAll(getErrors(file, convertor, WARN_EXT));
result.addAll(getErrors(file, ERR_EXT));
result.addAll(getErrors(file, WARN_EXT));

return result;
}

private <T> List<T> getErrors(FileObject file, ReverseConvertor<T> convertor, String ext) {
private List<Task> getErrors(FileObject file, String ext) {
LOG.log(Level.FINE, "getErrors, file={0}, ext={1}", new Object[] {FileUtil.getFileDisplayName(file), ext}); //NOI18N

try {
Expand All @@ -143,16 +122,16 @@ private <T> List<T> getErrors(FileObject file, ReverseConvertor<T> convertor, St
LOG.log(Level.FINE, "getErrors, error file={0}", input == null ? "null" : input.getAbsolutePath()); //NOI18N

if (input == null || !input.canRead())
return Collections.emptyList();
return Collections.<Task>emptyList();

input.getParentFile().mkdirs();

return loadErrors(input, convertor);
return loadErrors(input, file);
} catch (IOException e) {
LOG.log(Level.FINE, null, e);
}

return Collections.emptyList();
return Collections.<Task>emptyList();
}

private <T> boolean dumpErrors(File output, Iterable<? extends T> errors, Convertor<T> convertor, boolean interestedInReturnValue) throws IOException {
Expand All @@ -165,15 +144,7 @@ private <T> boolean dumpErrors(File output, Iterable<? extends T> errors, Conver
for (T err : errors) {
pw.print(convertor.getKind(err).name());
pw.print(':'); //NOI18N
if (convertor instanceof Convertor2) {
ErrorsCache.Range range = ((Convertor2<T>) convertor).getRange(err);
pw.print(String.format("%d,%d", range.getStart().getLine(), range.getStart().getColumn()));
if (range.getEnd() != null) {
pw.print(String.format("-%d,%d", range.getEnd().getLine(), range.getEnd().getColumn()));
}
} else {
pw.print(convertor.getLineNumber(err));
}
pw.print(convertor.getLineNumber(err));
pw.print(':'); //NOI18N

String description = convertor.getMessage(err);
Expand Down Expand Up @@ -229,7 +200,6 @@ public <T> void dumpErrors(final URL root, final Indexable i, final Iterable<? e
}
});
} catch (IOException ex) {
Exceptions.attachMessage(ex, "can't dump errors for: " + String.valueOf(i));
Exceptions.printStackTrace(ex);
}
}
Expand Down Expand Up @@ -285,8 +255,8 @@ private <T> void dumpErrors(TransactionContext c, URL root, Indexable i, Iterabl
c.rootsToRefresh.add(root);
}

private <T> List<T> loadErrors(File input, ReverseConvertor<T> convertor) throws IOException {
List<T> result = new LinkedList<>();
private List<Task> loadErrors(File input, FileObject file) throws IOException {
List<Task> result = new LinkedList<Task>();
BufferedReader pw = new BufferedReader(new InputStreamReader(new FileInputStream(input), StandardCharsets.UTF_8));
String line;

Expand All @@ -307,26 +277,18 @@ private <T> List<T> loadErrors(File input, ReverseConvertor<T> convertor) throws
continue;
}

ErrorsCache.Range range;
Matcher matcher = PATTERN.matcher(parts[1]);
if (matcher.matches()) {
ErrorsCache.Position start = new ErrorsCache.Position(Integer.parseInt(matcher.group(1)), Integer.parseInt(matcher.group(2)));
ErrorsCache.Position end = matcher.group(3) != null && matcher.group(4) != null ? new ErrorsCache.Position(Integer.parseInt(matcher.group(3)), Integer.parseInt(matcher.group(4))) : null;
range = new ErrorsCache.Range(start, end);
} else {
int lineNumber = Integer.parseInt(parts[1]);
range = new ErrorsCache.Range(new ErrorsCache.Position(lineNumber, 1), null);
}

int lineNumber = Integer.parseInt(parts[1]);
String message = parts[2];

message = message.replace("\\d", ":") //NOI18N
.replace("\\n", "\n") //NOI18N
.replace("\\\\", "\\"); //NOI18N
message = message.replaceAll("\\\\d", ":"); //NOI18N
message = message.replaceAll("\\\\n", " "); //NOI18N
message = message.replaceAll("\\\\\\\\", "\\\\"); //NOI18N

T item = convertor.get(kind, range, message);
if (null != item) {
result.add(item);
String severity = getTaskType(kind);

if (null != severity) {
Task err = Task.create(file, severity, message, lineNumber);
result.add(err);
}
}

Expand Down Expand Up @@ -389,12 +351,12 @@ private List<URL> getAllFilesWithRecord(URL root, boolean onlyErrors) throws IOE
public List<URL> getAllFilesInError(URL root) throws IOException {
return getAllFilesWithRecord(root, true);
}

public boolean isInError(FileObject file, boolean recursive) {
LOG.log(Level.FINE, "file={0}, recursive={1}", new Object[] {file, Boolean.valueOf(recursive)}); //NOI18N

if (file.isData()) {
return !getErrors(file, getTaskConvertor(file), ERR_EXT).isEmpty();
return !getErrors(file, ERR_EXT).isEmpty();
} else {
try {
ClassPath cp = Utilities.getSourceClassPathFor (file);
Expand Down
68 changes: 0 additions & 68 deletions ide/parsing.indexing/src/org/netbeans/modules/parsing/spi/indexing/ErrorsCache.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import java.net.URL;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import org.netbeans.modules.parsing.impl.indexing.errors.TaskCache;
import org.openide.filesystems.FileObject;

Expand Down Expand Up @@ -75,17 +74,6 @@ public static Collection<? extends URL> getAllFilesWithRecord(URL root) throws I
return Collections.unmodifiableCollection(TaskCache.getDefault().getAllFilesWithRecord(root));
}

/**Return all errors or warnings for the given file
*
* @param file file for which the errors are being retrieved
* @param convertor constructor of {@code T} instances from error description properties
* @return errors or warnings
* @since 9.37
*/
public static <T> List<T> getErrors(FileObject file, ReverseConvertor<T> convertor) throws IOException {
return Collections.unmodifiableList(TaskCache.getDefault().getErrors(file, convertor));
}

/**Getter for properties of the given error description.
*/
public static interface Convertor<T> {
Expand All @@ -94,62 +82,6 @@ public static interface Convertor<T> {
public String getMessage(T t);
}

/**Position in a text expressed as 1-based line and character offset.
* @since 9.37
*/
public static final class Position {
private int line;
private int column;

public Position(int line, int column) {
this.line = line;
this.column = column;
}

public int getLine() {
return line;
}

public int getColumn() {
return column;
}
}

/**Range in a text expressed as (1-based) start and end positions.
* @since 9.37
*/
public static final class Range {
private Position start;
private Position end;

public Range(Position start, Position end) {
this.start = start;
this.end = end;
}

public Position getStart() {
return start;
}

public Position getEnd() {
return end;
}
}

/**Getter for properties of the given error description including the range.
* @since 9.37
*/
public static interface Convertor2<T> extends Convertor<T> {
public Range getRange(T t);
}

/**Constructor of error description from the properties.
* @since 9.37
*/
public static interface ReverseConvertor<T> {
public T get(ErrorKind kind, Range range, String message);
}

public static enum ErrorKind {
/**Error, that should be used to show error badge in the projects tab.
*/
Expand Down
Loading

0 comments on commit 6308a54

Please sign in to comment.