From 6860d4accc5a3368dcbd46509df7307e38daff8e Mon Sep 17 00:00:00 2001 From: Ivan Migalev Date: Fri, 7 Mar 2025 22:09:01 +0100 Subject: [PATCH] Settings Import: code cleanup GitOrigin-RevId: 76492f797108ff063b8c240a5244e662cdca7088 --- .../vswin/VSWinTransferSettingsProvider.kt | 4 ++-- .../vswin/parsers/VSIsolationIniParser.kt | 6 +++--- .../backend/providers/vswin/parsers/VSParser.kt | 4 ++-- .../providers/vswin/parsers/VSRegistryParserNew.kt | 6 +++--- .../backend/providers/vswin/parsers/VSXmlParser.kt | 4 ++-- .../vswin/parsers/data/KeyBindingsParsedData.kt | 4 ++-- .../vswin/parsers/data/VSParsedDataCreator.kt | 4 ++-- .../backend/providers/vswin/utilities/VSHive.kt | 14 ++++++-------- .../utilities/VSPossibleVersionsEnumerator.kt | 3 ++- .../vswin/utilities/VSProfileDetectorUtils.kt | 3 ++- 10 files changed, 26 insertions(+), 26 deletions(-) diff --git a/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/VSWinTransferSettingsProvider.kt b/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/VSWinTransferSettingsProvider.kt index 6d7dacbee19a..845e9e7ca615 100644 --- a/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/VSWinTransferSettingsProvider.kt +++ b/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/VSWinTransferSettingsProvider.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.ide.startup.importSettings.transfer.backend.providers.vswin import com.intellij.icons.AllIcons @@ -9,11 +9,11 @@ import com.intellij.ide.startup.importSettings.fus.TransferSettingsCollector import com.intellij.ide.startup.importSettings.models.BaseIdeVersion import com.intellij.ide.startup.importSettings.models.FailedIdeVersion import com.intellij.ide.startup.importSettings.providers.TransferSettingsProvider -import com.intellij.ide.startup.importSettings.providers.vswin.utilities.VSHiveDetourFileNotFoundException import com.intellij.ide.startup.importSettings.providers.vswin.utilities.VSPossibleVersionsEnumerator import com.intellij.ide.startup.importSettings.providers.vswin.utilities.VSProfileDetectorUtils import com.intellij.ide.startup.importSettings.transfer.backend.models.IdeVersion import com.intellij.ide.startup.importSettings.transfer.backend.providers.vswin.parsers.VSParser +import com.intellij.ide.startup.importSettings.transfer.backend.providers.vswin.utilities.VSHiveDetourFileNotFoundException import com.intellij.ide.startup.importSettings.ui.representation.TransferSettingsRightPanelChooser import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.ui.Messages diff --git a/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/parsers/VSIsolationIniParser.kt b/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/parsers/VSIsolationIniParser.kt index 947490291009..a3dbd82bcd15 100644 --- a/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/parsers/VSIsolationIniParser.kt +++ b/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/parsers/VSIsolationIniParser.kt @@ -1,7 +1,7 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.ide.startup.importSettings.providers.vswin.parsers +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.ide.startup.importSettings.transfer.backend.providers.vswin.parsers -import com.intellij.ide.startup.importSettings.providers.vswin.utilities.VSHive +import com.intellij.ide.startup.importSettings.transfer.backend.providers.vswin.utilities.VSHive import com.intellij.ide.startup.importSettings.utils.Ini import com.intellij.openapi.diagnostic.logger import com.jetbrains.rd.util.lifetime.Lifetime diff --git a/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/parsers/VSParser.kt b/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/parsers/VSParser.kt index 8bfb6d9f44e9..a279c4868497 100644 --- a/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/parsers/VSParser.kt +++ b/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/parsers/VSParser.kt @@ -1,11 +1,11 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.ide.startup.importSettings.transfer.backend.providers.vswin.parsers import com.intellij.ide.startup.importSettings.db.KnownLafs import com.intellij.ide.startup.importSettings.models.Settings import com.intellij.ide.startup.importSettings.providers.vswin.parsers.VSXmlParser -import com.intellij.ide.startup.importSettings.providers.vswin.utilities.VSHive import com.intellij.ide.startup.importSettings.transfer.backend.db.KnownColorSchemes +import com.intellij.ide.startup.importSettings.transfer.backend.providers.vswin.utilities.VSHive import com.intellij.openapi.diagnostic.logger class VSParser(hive: VSHive) { diff --git a/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/parsers/VSRegistryParserNew.kt b/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/parsers/VSRegistryParserNew.kt index 951b57f2d14b..10e1bae8ba89 100644 --- a/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/parsers/VSRegistryParserNew.kt +++ b/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/parsers/VSRegistryParserNew.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.ide.startup.importSettings.providers.vswin.parsers import com.fasterxml.jackson.core.JsonFactory @@ -10,13 +10,13 @@ import com.intellij.ide.startup.importSettings.models.FeatureInfo import com.intellij.ide.startup.importSettings.models.ILookAndFeel import com.intellij.ide.startup.importSettings.models.RecentPathInfo import com.intellij.ide.startup.importSettings.providers.vswin.mappings.FontsAndColorsMappings -import com.intellij.ide.startup.importSettings.providers.vswin.utilities.VSHive -import com.intellij.ide.startup.importSettings.providers.vswin.utilities.VSHiveDetourFileNotFoundException import com.intellij.ide.startup.importSettings.providers.vswin.utilities.VSProfileDetectorUtils import com.intellij.ide.startup.importSettings.providers.vswin.utilities.VSProfileSettingsFileNotFound import com.intellij.ide.startup.importSettings.providers.vswin.utilities.registryUtils.impl.PrivateRegistryRoot import com.intellij.ide.startup.importSettings.providers.vswin.utilities.registryUtils.impl.RegistryRoot import com.intellij.ide.startup.importSettings.transfer.backend.providers.vswin.mappings.VisualStudioPluginsMapping +import com.intellij.ide.startup.importSettings.transfer.backend.providers.vswin.utilities.VSHive +import com.intellij.ide.startup.importSettings.transfer.backend.providers.vswin.utilities.VSHiveDetourFileNotFoundException import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.diagnostic.runAndLogException import com.intellij.openapi.util.io.systemIndependentPath diff --git a/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/parsers/VSXmlParser.kt b/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/parsers/VSXmlParser.kt index 8cd060115f89..0b157c62dd94 100644 --- a/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/parsers/VSXmlParser.kt +++ b/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/parsers/VSXmlParser.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.ide.startup.importSettings.providers.vswin.parsers import com.intellij.ide.startup.importSettings.db.KnownKeymaps @@ -7,9 +7,9 @@ import com.intellij.ide.startup.importSettings.models.Settings import com.intellij.ide.startup.importSettings.providers.vswin.parsers.data.FontsAndColorsParsedData import com.intellij.ide.startup.importSettings.providers.vswin.parsers.data.VSParsedData import com.intellij.ide.startup.importSettings.providers.vswin.parsers.data.VSParsedDataCreator -import com.intellij.ide.startup.importSettings.providers.vswin.utilities.VSHive import com.intellij.ide.startup.importSettings.providers.vswin.utilities.Version2 import com.intellij.ide.startup.importSettings.transfer.backend.providers.vswin.parsers.data.KeyBindingsParsedData +import com.intellij.ide.startup.importSettings.transfer.backend.providers.vswin.utilities.VSHive import com.intellij.openapi.diagnostic.logger import org.jdom.Document import org.jdom.Element diff --git a/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/parsers/data/KeyBindingsParsedData.kt b/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/parsers/data/KeyBindingsParsedData.kt index 5459cbdf7d6b..b23d97d4d77e 100644 --- a/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/parsers/data/KeyBindingsParsedData.kt +++ b/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/parsers/data/KeyBindingsParsedData.kt @@ -1,12 +1,12 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.ide.startup.importSettings.transfer.backend.providers.vswin.parsers.data import com.intellij.ide.startup.importSettings.models.KeyBinding import com.intellij.ide.startup.importSettings.providers.vswin.mappings.KeyBindingsMappings.newTokens import com.intellij.ide.startup.importSettings.providers.vswin.mappings.KeyBindingsMappings.vsCommandToIdeaAction import com.intellij.ide.startup.importSettings.providers.vswin.parsers.data.VSParsedData -import com.intellij.ide.startup.importSettings.providers.vswin.utilities.VSHive import com.intellij.ide.startup.importSettings.transfer.backend.providers.vswin.KnownPlugins +import com.intellij.ide.startup.importSettings.transfer.backend.providers.vswin.utilities.VSHive import com.intellij.openapi.actionSystem.KeyboardShortcut import com.intellij.openapi.diagnostic.logger import org.jdom.Element diff --git a/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/parsers/data/VSParsedDataCreator.kt b/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/parsers/data/VSParsedDataCreator.kt index 1910608945d8..8f4caed8b7cd 100644 --- a/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/parsers/data/VSParsedDataCreator.kt +++ b/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/parsers/data/VSParsedDataCreator.kt @@ -1,10 +1,10 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.ide.startup.importSettings.providers.vswin.parsers.data import com.intellij.ide.startup.importSettings.providers.vswin.mappings.FontsAndColorsMappings -import com.intellij.ide.startup.importSettings.providers.vswin.utilities.VSHive import com.intellij.ide.startup.importSettings.providers.vswin.utilities.Version2 import com.intellij.ide.startup.importSettings.transfer.backend.providers.vswin.parsers.data.KeyBindingsParsedData +import com.intellij.ide.startup.importSettings.transfer.backend.providers.vswin.utilities.VSHive import com.intellij.openapi.diagnostic.logger import org.jdom.Element diff --git a/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/utilities/VSHive.kt b/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/utilities/VSHive.kt index 2d2a518dcf89..a934775ef329 100644 --- a/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/utilities/VSHive.kt +++ b/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/utilities/VSHive.kt @@ -1,14 +1,14 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.ide.startup.importSettings.providers.vswin.utilities +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.ide.startup.importSettings.transfer.backend.providers.vswin.utilities import com.intellij.ide.startup.importSettings.TransferableIdeVersionId -import com.intellij.ide.startup.importSettings.providers.vswin.parsers.VSIsolationIniParser import com.intellij.ide.startup.importSettings.providers.vswin.parsers.VSRegistryParserNew +import com.intellij.ide.startup.importSettings.providers.vswin.utilities.Version2 +import com.intellij.ide.startup.importSettings.transfer.backend.providers.vswin.parsers.VSIsolationIniParser import com.intellij.openapi.diagnostic.logger import java.util.* class VSHiveDetourFileNotFoundException : Exception() -class VSHiveDetourFileReadErrorException(t: Throwable?) : Exception(t) private val logger = logger() // Example: "15.0_a0848a47Exp", where VS version = "15.0", Instance Id = "a0848a47", Root Suffix = "Exp". @@ -63,9 +63,7 @@ class VSHive(val version: Version2, val instanceId: String? = null, val rootSuff } companion object { - const val LATEST_VS_VERSION: Int = 16 - - val regex: Regex = Regex("\\b(?:(?:([0-9]{1,2}).([0-9]))(?:_([a-fA-F0-9]{8}))?([a-zA-Z0-9]*))\\b") + val regex: Regex = Regex("\\b([0-9]{1,2})\\.([0-9])(?:_([a-fA-F0-9]{8}))?([a-zA-Z0-9]*)\\b") fun parse(hive: String, type: Types = Types.All): VSHive? { logger.info("Starting $hive on type $type") @@ -76,7 +74,7 @@ class VSHive(val version: Version2, val instanceId: String? = null, val rootSuff val ver = try { Version2(maj.toInt(), min.toInt()) } - catch (e: NumberFormatException) { + catch (_: NumberFormatException) { logger.warn("Bad major or minor version number ($hive)") return null } diff --git a/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/utilities/VSPossibleVersionsEnumerator.kt b/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/utilities/VSPossibleVersionsEnumerator.kt index e35fdb4de78e..c42fa45adaae 100644 --- a/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/utilities/VSPossibleVersionsEnumerator.kt +++ b/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/utilities/VSPossibleVersionsEnumerator.kt @@ -1,7 +1,8 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.ide.startup.importSettings.providers.vswin.utilities import com.intellij.ide.startup.importSettings.db.WindowsEnvVariables +import com.intellij.ide.startup.importSettings.transfer.backend.providers.vswin.utilities.VSHive import com.intellij.openapi.diagnostic.logger import com.sun.jna.platform.win32.Advapi32Util import com.sun.jna.platform.win32.WinReg diff --git a/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/utilities/VSProfileDetectorUtils.kt b/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/utilities/VSProfileDetectorUtils.kt index fe9e08e5f555..4a48b3d6fef3 100644 --- a/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/utilities/VSProfileDetectorUtils.kt +++ b/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/vswin/utilities/VSProfileDetectorUtils.kt @@ -1,7 +1,8 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.ide.startup.importSettings.providers.vswin.utilities import com.intellij.ide.startup.importSettings.db.WindowsEnvVariables +import com.intellij.ide.startup.importSettings.transfer.backend.providers.vswin.utilities.VSHive import com.intellij.openapi.diagnostic.logger