fix: fixing NPE and empty clangd file (#971)

espressif · May 28, 2024 · ace15be · ace15be
1 parent 9c3dd8a
commit ace15be
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/bundles/com.espressif.idf.core/src/com/espressif/idf/core/util/ClangdConfigFileHandler.java b/bundles/com.espressif.idf.core/src/com/espressif/idf/core/util/ClangdConfigFileHandler.java
@@ -77,7 +77,8 @@ private Map<String, Object> createOrGetExistingYamlStructure(Object obj)
 
  private void updateCompileFlagsSection(Map<String, Object> compileFlags, String buildFolderName)
  {
- compileFlags.put("CompilationDatabase", buildFolderName.isEmpty() ? "build" : buildFolderName); //$NON-NLS-1$ //$NON-NLS-2$
+ compileFlags.put("CompilationDatabase", //$NON-NLS-1$
+ buildFolderName == null || buildFolderName.isEmpty() ? "build" : buildFolderName); //$NON-NLS-1$
  compileFlags.put("Remove", Arrays.asList("-m*", "-f*")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
  }