TaskIndexingMode into JavaSourceTaskFactorysCancellableTasks created by the JavaSourceTaskFactorys are not executed during the scan to keep the semantic backward compatibility.
+ Constructors with the TaskIndexingMode were added into these factories to allow tasks to run during the scan.
+ TreePathHandle.getElementHandle.IndexingAwareParserResultTask which is a specialization of ParserResultTask
+ which can be executed during scan.
+ The ParserResultTasks are not executed during the scan to keep the semantic backward compatibility.
+ A specialization of the ParserResultTask the IndexingAwareParserResultTask was added.
+ The IndexingAwareParserResultTask can be executed during the scan.
+
ConstrainedBinaryIndexer.Registration.namePattern to allow indexers to use name pattern rather than expensive
diff --git a/parsing.api/nbproject/project.properties b/parsing.api/nbproject/project.properties
--- a/parsing.api/nbproject/project.properties
+++ b/parsing.api/nbproject/project.properties
@@ -3,4 +3,4 @@
javac.source=1.6
javadoc.apichanges=${basedir}/apichanges.xml
javadoc.arch=${basedir}/arch.xml
-spec.version.base=1.50.0
+spec.version.base=1.51.0
diff --git a/parsing.api/src/org/netbeans/modules/parsing/impl/TaskProcessor.java b/parsing.api/src/org/netbeans/modules/parsing/impl/TaskProcessor.java
--- a/parsing.api/src/org/netbeans/modules/parsing/impl/TaskProcessor.java
+++ b/parsing.api/src/org/netbeans/modules/parsing/impl/TaskProcessor.java
@@ -78,17 +78,11 @@
import org.netbeans.modules.parsing.api.Source;
import org.netbeans.modules.parsing.api.Task;
import org.netbeans.modules.parsing.api.UserTask;
+import org.netbeans.modules.parsing.api.indexing.IndexingManager;
import org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater;
import org.netbeans.modules.parsing.impl.indexing.Util;
-import org.netbeans.modules.parsing.spi.EmbeddingProvider;
-import org.netbeans.modules.parsing.spi.ParseException;
-import org.netbeans.modules.parsing.spi.Parser;
+import org.netbeans.modules.parsing.spi.*;
import org.netbeans.modules.parsing.spi.Parser.Result;
-import org.netbeans.modules.parsing.spi.ParserResultTask;
-import org.netbeans.modules.parsing.spi.SchedulerEvent;
-import org.netbeans.modules.parsing.spi.SchedulerTask;
-import org.netbeans.modules.parsing.spi.Scheduler;
-import org.netbeans.modules.parsing.spi.SourceModificationEvent;
import org.openide.util.Exceptions;
import org.openide.util.Mutex;
import org.openide.util.Parameters;
@@ -718,7 +712,11 @@
final Parser.Result currentResult = sourceCache.getResult (r.task);
if (currentResult != null) {
try {
- boolean shouldCall = !SourceAccessor.getINSTANCE().testFlag(source, SourceFlags.INVALID);
+ final boolean sourceInvalid = SourceAccessor.getINSTANCE().testFlag(source, SourceFlags.INVALID);
+ final boolean scanInProgress = IndexingManager.getDefault().isIndexing();
+ final boolean canRunDuringScan = (r.task instanceof IndexingAwareParserResultTask) &&
+ ((IndexingAwareParserResultTask)r.task).getIndexingMode() == TaskIndexingMode.ALLOWED_DURING_SCAN;
+ final boolean shouldCall = !sourceInvalid && (!scanInProgress || canRunDuringScan);
if (shouldCall) {
try {
final long startTime = System.currentTimeMillis();
diff --git a/parsing.api/src/org/netbeans/modules/parsing/spi/IndexingAwareParserResultTask.java b/parsing.api/src/org/netbeans/modules/parsing/spi/IndexingAwareParserResultTask.java
new file mode 100644
--- /dev/null
+++ b/parsing.api/src/org/netbeans/modules/parsing/spi/IndexingAwareParserResultTask.java
@@ -0,0 +1,63 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License. When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2012 Sun Microsystems, Inc.
+ */
+package org.netbeans.modules.parsing.spi;
+
+import org.netbeans.api.annotations.common.NonNull;
+import org.openide.util.Parameters;
+
+/**
+ *
+ * @author Tomas Zezula
+ * @since 1.51
+ */
+public abstract class IndexingAwareParserResultTask