Skip to content

Conversation

@hohwille
Copy link
Member

@hohwille hohwille commented Feb 3, 2025

fixes #982

@hohwille hohwille self-assigned this Feb 3, 2025
@hohwille hohwille added this to the release:2025.02.001 milestone Feb 3, 2025
@coveralls
Copy link
Collaborator

coveralls commented Feb 3, 2025

Pull Request Test Coverage Report for Build 13183115758

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 158 unchanged lines in 3 files lost coverage.
  • Overall coverage increased (+0.09%) to 68.469%

Files with Coverage Reduction New Missed Lines %
com/devonfw/tools/ide/tool/ide/IdeToolCommandlet.java 7 77.59%
com/devonfw/tools/ide/merge/PropertiesMerger.java 26 38.55%
com/devonfw/tools/ide/io/FileAccessImpl.java 125 65.13%
Totals Coverage Status
Change from base Build 13175872879: 0.09%
Covered Lines: 7393
Relevant Lines: 10384

💛 - Coveralls

hohwille and others added 3 commits February 3, 2025 17:19
Co-authored-by: jan-vcapgemini <59438728+jan-vcapgemini@users.noreply.github.com>
@hohwille hohwille added enhancement New feature or request merger workspace template merger (XML, JSON, properties) configuration should be configurable or configuration change labels Feb 3, 2025
Copy link
Contributor

@jan-vcapgemini jan-vcapgemini left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@hohwille hohwille merged commit 9c2006b into devonfw:main Feb 7, 2025
4 checks passed
@jan-vcapgemini jan-vcapgemini self-assigned this Feb 19, 2025
@jan-vcapgemini
Copy link
Contributor

jan-vcapgemini commented Feb 19, 2025

Tested on Windows 10 x64
Using IDEasy version: 2025.01.001-beta-01_21_02-SNAPSHOT

ide create user-specific-config
ide intellij

initialized new git repository in workspaces/main
added all files and committed
ide vscode
took really long to install plugins without a progress bar
added all files and committed
ide eclipse
also took really long to install plugins while constantly repeating

Start: Install plugin anyedit
Start: Install java
Version 21.0.6_7 of tool java is already installed
Successfully ended step 'Install java'.
Successfully ended step 'Install plugin anyedit'.
Start: Install plugin startexplorer
Start: Install java
Version 21.0.6_7 of tool java is already installed
Successfully ended step 'Install java'.
Successfully ended step 'Install plugin startexplorer'.
Start: Install plugin checkstyle
Start: Install java
Version 21.0.6_7 of tool java is already installed

added all files and committed
after restarting intellij, several xml merger issues popped up (despite having the latest settings)

Failed to merge workspace file D:\Projects\user-specific-conf\workspaces\main\.idea\workspace.xml with update template D:\Projects\user-specific-conf\settings\intellij\workspace\update\.idea\workspace.xml and setup file D:\Projects\user-specific-conf\settings\intellij\workspace\setup\.idea\workspace.xml!
com.devonfw.tools.ide.merge.xmlmerger.XmlMergeException: Merge strategy combine failed on /project[@version='4']/component[@name='MavenImportPreferences']/option[@name='generalSettings']
Failed to merge workspace file D:\Projects\user-specific-conf\workspaces\main\.idea\mavenProjectSettings.xml with update template D:\Projects\user-specific-conf\settings\intellij\workspace\update\.idea\mavenProjectSettings.xml and setup file D:\Projects\user-specific-conf\settings\intellij\workspace\setup\.idea\mavenProjectSettings.xml!
com.devonfw.tools.ide.merge.xmlmerger.XmlMergeException: Merge strategy combine failed on /project[@version='4']/component[@name='MavenProjectSettings']/option[@name='testRunningSettings']
Failed to merge workspace file D:\Projects\user-specific-conf\workspaces\main\.intellij\config\options\trusted-paths.xml with update template D:\Projects\user-specific-conf\settings\intellij\workspace\update\.intellij\config\options\trusted-paths.xml and setup file D:\Projects\user-specific-conf\settings\intellij\workspace\setup\.intellij\config\options\trusted-paths.xml!
com.devonfw.tools.ide.merge.xmlmerger.XmlMergeException: Merge strategy combine failed on /application[@version='4']/component[@name='Trusted.Paths']/option[@name='TRUSTED_PROJECT_PATHS']
Failed to merge workspace file D:\Projects\user-specific-conf\workspaces\main\.intellij\config\options\nodejs.xml with update template D:\Projects\user-specific-conf\settings\intellij\workspace\update\.intellij\config\options\nodejs.xml and setup file D:\Projects\user-specific-conf\settings\intellij\workspace\setup\.intellij\config\options\nodejs.xml!
com.devonfw.tools.ide.merge.xmlmerger.XmlMergeException: Merge strategy combine failed on /application[]/component[@name='NodeJsLocalInterpreterManager']

disabled ide.open.readme.md.on.startup in advanced settings
copied .intellij/config/options/advancedSettings.xml to ~/.ide
C:\Users\username\.ide\intellij\workspace\update\.intellij\config\options\advancedSettings.xml
ide create new-user-specific-conf
switched to new project
ide intellij
checked advanced settings
option was still enabled

Tried the same with vscode
Changed editor font size from 14 to 24
"editor.fontSize": 24
Created: C:\Users\username\.ide\vscode\workspace\update\.vscode\.userdata\User\settings.json
Switched to other project and started vscode
settings were not used there too

Looks like the feature is not working as expected.
Also I think we should enhance the documentation for the ~/.ide feature I had to check the tests to find the correct position for my settings.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

configuration should be configurable or configuration change enhancement New feature or request merger workspace template merger (XML, JSON, properties)

Projects

Status: ✅ Done

Development

Successfully merging this pull request may close these issues.

Ability for user specific IDE configuration

3 participants