Merge branch 'master' into IEP-1649

Author: AndriiFilippov

.codespellrc

@@ -0,0 +1,4 @@
+[codespell]
+skip = _build
+ignore-words-list = laf,OT,hart,EHEN,targetIn,dout,DOUT,oen,OEN,EMAC,emac,doubleClick,AfterAll
+write-changes = true

.github/workflows/pre-commit.yml

@@ -22,6 +22,22 @@ jobs:
     - name: Install pre-commit
       run: pip install pre-commit
 
+    - name: Install codespell
+      run: pip install codespell
+    
+    - name: Run pre-commit checks
+      run: |
+        BASE_SHA=${{ github.event.pull_request.base.sha }}
+        HEAD_SHA=${{ github.event.pull_request.head.sha }}
+        CHANGED_FILES=$(git diff --name-only $BASE_SHA $HEAD_SHA | grep -E '\.(py|c|h|md|rst|yml)$' || true)
+        echo "Changed files:"
+        echo "$CHANGED_FILES" | tr ' ' '\n'
+        if [ -n "$CHANGED_FILES" ]; then
+          pre-commit run --files $CHANGED_FILES -v
+        else
+          echo "No matching files changed."
+        fi
+
     - name: Validate commit messages
       run: |
         if [ "${{ github.event_name }}" = "pull_request" ]; then

.pre-commit-config.yaml

@@ -9,4 +9,12 @@
         rev: v1.2.1
         hooks:
           - id: conventional-precommit-linter
-            stages: [commit-msg]
+            stages: [commit-msg]
+
+      - repo: https://github.com/codespell-project/codespell
+        rev: v2.4.1
+        hooks:
+          - id: codespell
+            stages: [pre-commit]
+            args: [--config=.codespellrc]
+            files: ^.*\.(py|c|h|md|rst|yml)$

CONTRIBUTING.md

@@ -29,13 +29,13 @@ Fix: Window -> Preferences -> Plug-in Development -> API Baselines -> Missing AP
 
 ![image](https://github.com/espressif/idf-eclipse-plugin/assets/69584713/0a879d4f-99e2-4d5a-98ca-a745a6683752)
 
-Fix: in "Project Explorer" -> com.espressif.idf.tests -> com.espressif.idf.ui.test -> META-INF -> doubleclick MANIFEST.MF -> Dependencies -> Add... -> Type "slf4j.api" -> Add&Save. 
+Fix: in "Project Explorer" -> com.espressif.idf.tests -> com.espressif.idf.ui.test -> META-INF -> double-click MANIFEST.MF -> Dependencies -> Add... -> Type "slf4j.api" -> Add&Save. 
 
-* After importing project Eclipse might prompt a wizard to install `Maven Plugin Connectors` to resolve the idf-eclipse-plugins maven errors, make sure you install all of them. But, depending on the version(Eclipse / Extentions), an error may occur:
+* After importing project Eclipse might prompt a wizard to install `Maven Plugin Connectors` to resolve the idf-eclipse-plugins maven errors, make sure you install all of them. But, depending on the version(Eclipse / Extensions), an error may occur:
 
 ![image](https://github.com/espressif/idf-eclipse-plugin/assets/69584713/048196c9-8ac6-4f10-8095-596ab2ef05f2)
 
-Fix: check the error and delete one of the extention (usually Tycho) - Help -> Install New Software -> Already Installed -> select "Tycho" -> Uninstall. 
+Fix: check the error and delete one of the extension (usually Tycho) - Help -> Install New Software -> Already Installed -> select "Tycho" -> Uninstall. 
 
 * Run as -> SWTBot Test -> may lead to error: 
 
@@ -50,7 +50,7 @@ Fix: Uninstall SWTBot -> Install latest snapshot(04.04.2023): http://download.ec
 * Make changes locally on a specific local branch
 * Test with Maven Tycho using `$ mvn clean verify -Djarsigner.skip=true`
 * Submit a Pull Request(PR)
-* It is also recommended that you add or update a Functional Test if you are adding or updating a functionality in plugin. More details about adding SWTBot Funtional test can be found in the README.md in test folder in the repo.
+* It is also recommended that you add or update a Functional Test if you are adding or updating a functionality in plugin. More details about adding SWTBot Functional test can be found in the README.md in test folder in the repo.
 
 ## Coding Standards and guidelines
 * Code formatter https://github.com/espressif/idf-eclipse-plugin/blob/master/resources/espressif_eclipse_formatter.xml

bundles/com.espressif.idf.terminal.connector.serial/src/com/espressif/idf/terminal/connector/serial/controls/SerialSettingsPage.java

@@ -101,7 +101,30 @@ public void createControl(Composite parent)
 
 		projectCombo = new Combo(comp, SWT.NONE);
 		projectCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		Optional<IProject> optProject = Optional.ofNullable(EclipseUtil.getSelectedIDFProjectInExplorer());
+		
+		// Safely get selected IDF project with error handling
+		IProject selectedProject = null;
+		try {
+			selectedProject = EclipseUtil.getSelectedIDFProjectInExplorer();
+		} catch (NoSuchMethodError e) {
+			// Fallback: try to get any selected project
+			try {
+				selectedProject = EclipseUtil.getSelectedProjectInExplorer();
+				if (selectedProject != null) {
+					try {
+						if (!selectedProject.hasNature(IDFProjectNature.ID)) {
+							selectedProject = null; // Not an IDF project
+						}
+					} catch (CoreException ce) {
+						selectedProject = null;
+					}
+				}
+			} catch (Exception ex) {
+				// If all else fails, selectedProject remains null
+			}
+		}
+		
+		Optional<IProject> optProject = Optional.ofNullable(selectedProject);
 		optProject.ifPresent(project -> projectCombo.setText(project.getName()));
 		IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
 		for (IProject project : projects)

bundles/com.espressif.idf.terminal.connector/src/com/espressif/idf/terminal/connector/controls/IDFConsoleWizardConfigurationPanel.java

@@ -13,32 +13,34 @@
 package com.espressif.idf.terminal.connector.controls;
 
 import java.util.Map;
+import java.util.Optional;
 
-import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants;
 import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer;
 import org.eclipse.tm.terminal.view.ui.panels.AbstractExtendedConfigurationPanel;
-import org.eclipse.ui.ISelectionService;
-import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.WorkbenchEncoding;
-import org.osgi.framework.Bundle;
+
+import com.espressif.idf.core.IDFProjectNature;
+import com.espressif.idf.core.logging.Logger;
+import com.espressif.idf.ui.EclipseUtil;
 
 /**
  * IDF console wizard configuration panel implementation.
  */
 public class IDFConsoleWizardConfigurationPanel extends AbstractExtendedConfigurationPanel {
 
-	private Object resource;
+	private Combo projectCombo;
 
 	/**
 	 * Constructor.
@@ -55,6 +57,7 @@ public void setupPanel(Composite parent) {
 		panel.setLayout(new GridLayout());
 		panel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 
+		createProjectCombo(panel);
 		// Create the encoding selection combo
 		createEncodingUI(panel, false);
 
@@ -76,12 +79,40 @@ public void setupPanel(Composite parent) {
 		layoutData.heightHint = 80;
 		label.setLayoutData(layoutData);
 
-		Bundle bundle = Platform.getBundle("org.eclipse.core.resources"); //$NON-NLS-1$
-		if (bundle != null && bundle.getState() != Bundle.UNINSTALLED && bundle.getState() != Bundle.STOPPING) {
-			resource = getSelectionResource();
+		setControl(panel);
+	}
+
+	private void createProjectCombo(Composite parent) {
+
+		Composite panel = new Composite(parent, SWT.NONE);
+		GridLayout layout = new GridLayout(2, false);
+		layout.marginHeight = 0;
+		layout.marginWidth = 0;
+		panel.setLayout(layout);
+		panel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+
+		Label projectLabel = new Label(panel, SWT.NONE);
+		projectLabel
+				.setText(Messages.IDFConsoleWizardConfigurationPanel_IDFConsoleWizardConfigurationPanel_ProjectLabel);
+
+		projectCombo = new Combo(panel, SWT.READ_ONLY);
+		projectCombo.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+
+		for (IProject project : ResourcesPlugin.getWorkspace().getRoot().getProjects()) {
+			try {
+				if (project.hasNature(IDFProjectNature.ID)) {
+					projectCombo.add(project.getName());
+				}
+			} catch (CoreException e) {
+				Logger.log(e);
+			}
 		}
 
-		setControl(panel);
+		Optional<IProject> optProject = Optional.ofNullable(EclipseUtil.getSelectedIDFProjectInExplorer());
+		optProject.ifPresentOrElse(project -> projectCombo.setText(project.getName()), () -> {
+			if (projectCombo.getItemCount() > 0)
+				projectCombo.select(0);
+		});
 	}
 
 	@Override
@@ -96,19 +127,17 @@ public void setupData(Map<String, Object> data) {
 
 	@Override
 	public void extractData(Map<String, Object> data) {
-		// set the terminal connector id for local terminal
+
 		data.put(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID,
 				"com.espressif.idf.terminal.connector.espidfConnector"); //$NON-NLS-1$
 
-		// Store the encoding
 		data.put(ITerminalsConnectorConstants.PROP_ENCODING, getEncoding());
 
-		Bundle bundle = Platform.getBundle("org.eclipse.core.resources"); //$NON-NLS-1$
-		if (bundle != null && bundle.getState() != Bundle.UNINSTALLED && bundle.getState() != Bundle.STOPPING) {
-			// if we have a IResource selection use the location for working directory
-			if (resource instanceof org.eclipse.core.resources.IResource) {
-				String dir = ((org.eclipse.core.resources.IResource) resource).getProject().getLocation().toString();
-				data.put(ITerminalsConnectorConstants.PROP_PROCESS_WORKING_DIR, dir);
+		if (projectCombo != null && !projectCombo.isDisposed() && !projectCombo.getText().isEmpty()) {
+			IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(projectCombo.getText());
+			if (p != null && p.exists() && p.getLocation() != null) {
+				data.put(ITerminalsConnectorConstants.PROP_PROCESS_WORKING_DIR, p.getLocation().toOSString());
+				data.put(ITerminalsConnectorConstants.PROP_TITLE, p.getName());
 			}
 		}
 	}
@@ -147,25 +176,4 @@ protected String getHostFromSettings() {
 	public boolean isWithHostList() {
 		return false;
 	}
-
-	/**
-	 * Returns the IResource from the current selection
-	 *
-	 * @return the IResource, or <code>null</code>.
-	 */
-	private org.eclipse.core.resources.IResource getSelectionResource() {
-		ISelectionService selectionService = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService();
-		ISelection selection = selectionService != null ? selectionService.getSelection() : StructuredSelection.EMPTY;
-
-		if (selection instanceof IStructuredSelection && !selection.isEmpty()) {
-			Object element = ((IStructuredSelection) selection).getFirstElement();
-			if (element instanceof org.eclipse.core.resources.IResource) {
-				return ((org.eclipse.core.resources.IResource) element);
-			}
-			if (element instanceof IAdaptable) {
-				return ((IAdaptable) element).getAdapter(org.eclipse.core.resources.IResource.class);
-			}
-		}
-		return null;
-	}
 }

bundles/com.espressif.idf.terminal.connector/src/com/espressif/idf/terminal/connector/controls/Messages.java

@@ -0,0 +1,17 @@
+package com.espressif.idf.terminal.connector.controls;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = Messages.class.getPackageName() + ".messages"; //$NON-NLS-1$
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+
+	public static String IDFConsoleWizardConfigurationPanel_MissingProjectErrorMsg;
+	public static String IDFConsoleWizardConfigurationPanel_IDFConsoleWizardConfigurationPanel_ProjectLabel;
+}

bundles/com.espressif.idf.terminal.connector/src/com/espressif/idf/terminal/connector/controls/messages.properties

@@ -0,0 +1,2 @@
+IDFConsoleWizardConfigurationPanel_MissingProjectErrorMsg=Please create and select an ESP-IDF Project first.
+IDFConsoleWizardConfigurationPanel_IDFConsoleWizardConfigurationPanel_ProjectLabel=Project name: