Skip to content

Commit 14f661a

Browse files
fix: resolve conflicts and merge new changes
1 parent 52cbe0b commit 14f661a

1 file changed

Lines changed: 21 additions & 0 deletions

File tree

bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/wizard/NewIDFProjectWizard.java

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
import java.io.File;
88

99
import org.eclipse.cdt.debug.internal.core.InternalDebugCoreMessages;
10+
import org.eclipse.core.resources.IFile;
1011
import org.eclipse.core.resources.IProject;
12+
import org.eclipse.core.resources.IResource;
1113
import org.eclipse.core.resources.ResourcesPlugin;
1214
import org.eclipse.core.runtime.CoreException;
1315
import org.eclipse.core.runtime.IProgressMonitor;
@@ -110,6 +112,7 @@ public boolean performFinish()
110112
String projectName = projectCreationWizardPage.getProjectName();
111113
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
112114
selProvider.setSelection(new StructuredSelection(project));
115+
createClangdFile(project);
113116
}
114117
}
115118

@@ -138,6 +141,24 @@ public void widgetDisposed(DisposeEvent event)
138141
return performFinish;
139142
}
140143

144+
private void createClangdFile(IProject project)
145+
{
146+
String fileContent = "CompileFlags:\n" //$NON-NLS-1$
147+
+ " Remove: [-fno-tree-switch-conversion, -fstrict-volatile-bitfields]\n" //$NON-NLS-1$
148+
+ ""; //$NON-NLS-1$
149+
150+
try {
151+
IFile file = project.getFile(".clangd"); //$NON-NLS-1$
152+
file.create(
153+
new java.io.ByteArrayInputStream(fileContent.getBytes()),
154+
IResource.FORCE | IResource.KEEP_HISTORY,
155+
null
156+
);
157+
} catch (Exception e) {
158+
Logger.log(e);
159+
}
160+
}
161+
141162
private void createDefaultDebugConfig()
142163
{
143164
Shell activeShell = Display.getDefault().getActiveShell();

0 commit comments

Comments
 (0)