From 917831205bfe0618ad6c7fceb57a70d1346d0859 Mon Sep 17 00:00:00 2001 From: Jan Lahoda Date: Sat, 10 Apr 2021 23:55:36 +0200 Subject: [PATCH 1/2] [NETBEANS-5565] Disable running LSP servers for VCS diffs. --- .../src/org/netbeans/modules/lsp/client/LSPBindings.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ide/lsp.client/src/org/netbeans/modules/lsp/client/LSPBindings.java b/ide/lsp.client/src/org/netbeans/modules/lsp/client/LSPBindings.java index 6744c6dbd6bf..ddcbba1fa20f 100644 --- a/ide/lsp.client/src/org/netbeans/modules/lsp/client/LSPBindings.java +++ b/ide/lsp.client/src/org/netbeans/modules/lsp/client/LSPBindings.java @@ -161,6 +161,11 @@ public static synchronized LSPBindings getBindingsImpl(Project prj, FileObject f if (prj == null) { dir = file.getParent(); + File dirFile = FileUtil.toFile(dir); + if (dirFile.getName().startsWith("vcs-") && dirFile.getAbsolutePath().startsWith(System.getProperty("java.io.tmpdir"))) { + //diff dir, don't start servers: + return null; + } } else { dir = prj.getProjectDirectory(); } From 3afe3903a76ce10bbbeaba802207eb2bc19fd069 Mon Sep 17 00:00:00 2001 From: Jan Lahoda Date: Sun, 11 Apr 2021 09:18:52 +0200 Subject: [PATCH 2/2] Fixing test. --- .../src/org/netbeans/modules/lsp/client/LSPBindings.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ide/lsp.client/src/org/netbeans/modules/lsp/client/LSPBindings.java b/ide/lsp.client/src/org/netbeans/modules/lsp/client/LSPBindings.java index ddcbba1fa20f..34ca892d8240 100644 --- a/ide/lsp.client/src/org/netbeans/modules/lsp/client/LSPBindings.java +++ b/ide/lsp.client/src/org/netbeans/modules/lsp/client/LSPBindings.java @@ -162,7 +162,9 @@ public static synchronized LSPBindings getBindingsImpl(Project prj, FileObject f if (prj == null) { dir = file.getParent(); File dirFile = FileUtil.toFile(dir); - if (dirFile.getName().startsWith("vcs-") && dirFile.getAbsolutePath().startsWith(System.getProperty("java.io.tmpdir"))) { + if (dirFile != null && + dirFile.getName().startsWith("vcs-") && + dirFile.getAbsolutePath().startsWith(System.getProperty("java.io.tmpdir"))) { //diff dir, don't start servers: return null; }