This is an automated email from the ASF dual-hosted git repository. mbien pushed a commit to branch revert-7983-NETBEANS-7981 in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit ef08ea6d774a522dba929825fc3adb3b0aced5cd Author: Michael Bien <[email protected]> AuthorDate: Wed Nov 27 18:06:06 2024 +0100 Revert "[NETBEANS-7981] Handling Diagnostics with position -1 while writing error/warning index." --- .../parsing/impl/indexing/errors/TaskCache.java | 1 - .../java/source/indexing/JavaCustomIndexer.java | 8 +--- .../source/indexing/VanillaCompileWorkerTest.java | 54 ---------------------- 3 files changed, 1 insertion(+), 62 deletions(-) diff --git a/ide/parsing.indexing/src/org/netbeans/modules/parsing/impl/indexing/errors/TaskCache.java b/ide/parsing.indexing/src/org/netbeans/modules/parsing/impl/indexing/errors/TaskCache.java index 90442b05c2b..08a415febd5 100644 --- a/ide/parsing.indexing/src/org/netbeans/modules/parsing/impl/indexing/errors/TaskCache.java +++ b/ide/parsing.indexing/src/org/netbeans/modules/parsing/impl/indexing/errors/TaskCache.java @@ -229,7 +229,6 @@ public class TaskCache { } }); } catch (IOException ex) { - Exceptions.attachMessage(ex, "can't dump errors for: " + String.valueOf(i)); Exceptions.printStackTrace(ex); } } diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/indexing/JavaCustomIndexer.java b/java/java.source.base/src/org/netbeans/modules/java/source/indexing/JavaCustomIndexer.java index 0e5560824b6..063e99355df 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/indexing/JavaCustomIndexer.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/indexing/JavaCustomIndexer.java @@ -1324,15 +1324,9 @@ public class JavaCustomIndexer extends CustomIndexer { if (lm == null) { return new ErrorsCache.Range(new ErrorsCache.Position((int) t.getLineNumber(), (int) t.getColumnNumber()), null); } - ErrorsCache.Position endPos; - if (t.getEndPosition() == (-1)) { - endPos = null; - } else { - endPos = new ErrorsCache.Position((int) lm.getLineNumber(t.getEndPosition()), (int) lm.getColumnNumber(t.getEndPosition())); - } return new ErrorsCache.Range( new ErrorsCache.Position((int) lm.getLineNumber(t.getStartPosition()), (int) lm.getColumnNumber(t.getStartPosition())), - endPos + new ErrorsCache.Position((int) lm.getLineNumber(t.getEndPosition()), (int) lm.getColumnNumber(t.getEndPosition())) ); } @Override diff --git a/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/indexing/VanillaCompileWorkerTest.java b/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/indexing/VanillaCompileWorkerTest.java index 482ddf14a06..bcd1c07c870 100644 --- a/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/indexing/VanillaCompileWorkerTest.java +++ b/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/indexing/VanillaCompileWorkerTest.java @@ -27,7 +27,6 @@ import java.util.Collections; import java.util.EnumSet; import java.util.HashMap; import java.util.HashSet; -import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; @@ -54,16 +53,11 @@ import org.netbeans.junit.NbTestSuite; import org.netbeans.modules.classfile.ClassFile; import org.netbeans.modules.java.source.indexing.CompileWorker.ParsingOutput; import org.netbeans.modules.java.source.indexing.JavaCustomIndexer.CompileTuple; -import org.netbeans.modules.parsing.impl.indexing.errors.TaskCache; import org.netbeans.modules.parsing.spi.indexing.Context; -import org.netbeans.modules.parsing.spi.indexing.ErrorsCache; -import org.netbeans.modules.parsing.spi.indexing.ErrorsCache.ErrorKind; -import org.netbeans.modules.parsing.spi.indexing.ErrorsCache.Range; import org.netbeans.spi.java.classpath.support.ClassPathSupport; import org.openide.filesystems.FileObject; import org.openide.filesystems.FileUtil; import org.openide.filesystems.URLMapper; -import org.openide.util.Pair; /** * @@ -2437,54 +2431,6 @@ public class VanillaCompileWorkerTest extends CompileWorkerTestBase { assertEquals(expected, file2Fixed); } - public void testBrokenWarningEndPos() throws Exception { //NETBEANS-7981 - setCompilerOptions(Arrays.asList("-Xlint:deprecation")); - - String code = """ - package test; - public class Test { - void t() { - new D() {}; - } - } - class D { - @Deprecated - D() {} - } - """; - ParsingOutput result = runIndexing(Arrays.asList(compileTuple("test/Test.java", - code)), - Arrays.asList()); - - assertFalse(result.lowMemory); - assertTrue(result.success); - - Set<String> createdFiles = new HashSet<String>(); - - for (File created : result.createdFiles) { - createdFiles.add(getWorkDir().toURI().relativize(created.toURI()).getPath()); - } - - assertEquals(new HashSet<String>(Arrays.asList("cache/s1/java/15/classes/test/Test.sig", - "cache/s1/java/15/classes/test/Test$1.sig", - "cache/s1/java/15/classes/test/D.sig")), - createdFiles); - record Data(ErrorKind kind, Pair<Pair<Integer, Integer>, Pair<Integer, Integer>> range) {} - List<Data> errors = TaskCache.getDefault().getErrors(getRoot().getFileObject("test/Test.java"), new ErrorsCache.ReverseConvertor<Data>() { - @Override - public Data get(ErrorKind kind, Range range, String message) { - return new Data(kind, Pair.of(Pair.of(range.getStart().getLine(), - range.getStart().getColumn()), - range.getEnd() != null ? Pair.of(range.getEnd().getLine(), - range.getEnd().getColumn()) - : null)); - } - }); - assertEquals(List.of(new Data(ErrorKind.WARNING, Pair.of(Pair.of(4, 9), Pair.of(4, 19))), - new Data(ErrorKind.WARNING, Pair.of(Pair.of(4, 17), null))), - errors); - } - public static void noop() {} @Override --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
