Skip to content

Commit 35e4b0a

Browse files
authored
Merge pull request #452 from Achal1607/standalone-fix
Fixed enable preview event field value for Gradle and Standalone projects
2 parents 04ce72f + 6f4abd0 commit 35e4b0a

File tree

2 files changed

+170
-93
lines changed

2 files changed

+170
-93
lines changed

nbcode/telemetry/src/org/netbeans/modules/nbcode/java/lsp/server/telemetry/SourceInfo.java

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@
2020
import java.lang.ref.WeakReference;
2121
import java.net.URI;
2222
import java.util.Map;
23+
import java.util.concurrent.ExecutionException;
2324
import java.util.function.Function;
25+
import java.util.logging.Level;
26+
import java.util.logging.Logger;
2427
import javax.tools.JavaFileObject;
2528
import javax.tools.SimpleJavaFileObject;
2629
import org.eclipse.lsp4j.services.LanguageClient;
@@ -38,7 +41,7 @@
3841
import org.openide.util.Lookup;
3942

4043
class SourceInfo {
41-
44+
private static final Logger LOG = Logger.getLogger(SourceInfo.class.getName());
4245
private final FileObject file;
4346
private final Project owner;
4447
final JavaFileObject source;
@@ -108,10 +111,15 @@ public String getJavaVersion() {
108111
return LspServerTelemetryManager.getJavaRuntimeVersion(lookupFunction);
109112
}
110113

111-
public boolean getPreviewEnabled() {
112-
return LspServerTelemetryManager.getInstance().isPreviewEnabled(file,
113-
owner == null ? LspServerTelemetryManager.ProjectType.standalone : LspServerTelemetryManager.getInstance().getProjectType(owner),
114-
getLanguageClient());
114+
public boolean getPreviewEnabled(){
115+
try {
116+
return LspServerTelemetryManager.getInstance().isPreviewEnabled(file,
117+
owner,
118+
getLanguageClient()).get();
119+
} catch (InterruptedException | ExecutionException ex) {
120+
LOG.log(Level.FINE, "exception while checking if preview enabled: {0}", (Object) ex);
121+
}
122+
return false;
115123
}
116124

117125
public static SourceInfo getSourceObject(ErrorProvider.Context context) {

0 commit comments

Comments
 (0)