🐛 Fix custom plugin setup for darwin (QD-9921)

tiulpin · tiulpin · commit 9b825dabd95b · 2025-05-29T00:37:16.000+02:00
diff --git a/core/properties.go b/core/properties.go
@@ -137,6 +137,10 @@ func GetScanProperties(c corescan.Context) []string {
 	if customPluginPathsValue != "" {
 		lines = append(lines, fmt.Sprintf("-Dplugin.path=%s", customPluginPathsValue))
 	}
+	disabledPluginsFile := c.Prod().DisabledPluginsFilePath()
+	if _, err := os.Stat(disabledPluginsFile); err == nil {
+		lines = append(lines, fmt.Sprintf("-Ddisabled.plugins.file.path=%s", strutil.QuoteIfSpace(disabledPluginsFile)))
+	}
 
 	cliProps, flags := c.PropertiesAndFlags()
 	for _, f := range flags {
diff --git a/core/startup/installers.go b/core/startup/installers.go
@@ -118,10 +118,6 @@ func downloadAndInstallIDE(
 		if dirs, err := filepath.Glob(filepath.Join(installDir, "*.app")); err == nil && len(dirs) == 1 {
 			installDir = filepath.Join(dirs[0], "Contents")
 		}
-		err = downloadCustomPlugins(ideUrl, installDir, spinner)
-		if err != nil {
-			log.Warning("Error while downloading custom plugins: " + err.Error())
-		}
 	}
 
 	return installDir
@@ -324,20 +320,27 @@ func verifySha256(checksumFile string, checkSumUrl string, filePath string) {
 	log.Info("Checksum of downloaded IDE was verified")
 }
 
-func downloadCustomPlugins(ideUrl string, installDir string, spinner *pterm.SpinnerPrinter) error {
+func downloadCustomPlugins(ideUrl string, targetDir string, spinner *pterm.SpinnerPrinter) error {
 	pluginsUrl := getPluginsURL(ideUrl)
-	log.Debugf("Downloading custom plugins from %s", pluginsUrl)
-	archivePath := filepath.Join(installDir, "custom-plugins.zip")
+	log.Debugf("Downloading custom plugins from %s to %s", pluginsUrl, targetDir)
+
+	if err := os.MkdirAll(targetDir, os.ModePerm); err != nil {
+		return fmt.Errorf("couldn't create a directory %s: %v", targetDir, err)
+	}
+
+	archivePath := filepath.Join(targetDir, "custom-plugins.zip")
 	err := utils.DownloadFile(archivePath, pluginsUrl, spinner)
 	if err != nil {
 		return fmt.Errorf("error while downloading plugins: %v", err)
 	}
-	_, err = exec.Command("tar", "-xf", archivePath, "-C", installDir).Output()
+
+	_, err = exec.Command("tar", "-xf", archivePath, "-C", targetDir).Output()
 	if err != nil {
 		return fmt.Errorf("tar: %s", err)
 	}
-	disabledPluginsPath := filepath.Join(installDir, "custom-plugins", "disabled_plugins.txt")
-	err = cp.Copy(disabledPluginsPath, filepath.Join(installDir, "disabled_plugins.txt"))
+
+	disabledPluginsPath := filepath.Join(targetDir, "custom-plugins", "disabled_plugins.txt")
+	err = cp.Copy(disabledPluginsPath, filepath.Join(targetDir, "disabled_plugins.txt"))
 	if err != nil {
 		return fmt.Errorf("error while copying plugins: %s", err)
 	}
diff --git a/core/startup/prepare.go b/core/startup/prepare.go
@@ -141,6 +141,15 @@ func prepareLocalIdeSettingsAndGetQodanaCloudUploadToken(
 		SyncConfigCache(prod, commonCtx.ConfDirPath(), commonCtx.CacheDir, true)
 		CreateUser("/etc/passwd")
 	}
+
+	if runtime.GOOS == "darwin" && commonCtx.Ide != "" {
+		if info := getIde(commonCtx.Ide); info != nil {
+			err := downloadCustomPlugins(info.Link, filepath.Dir(prod.CustomPluginsPath()), nil)
+			if err != nil {
+				log.Warning("Error while downloading custom plugins: " + err.Error())
+			}
+		}
+	}
 	return prod, token
 }
 
@@ -198,8 +207,6 @@ func prepareDirectories(prod product.Product, cacheDir string, logDir string, co
 	ideaOptions := filepath.Join(confDir, "options")
 	MakeDirAll(ideaOptions)
 	addKeepassIDEConfig(ideaOptions)
-
-	setDisabledPluginsTxt(prod, confDir)
 }
 
 func MakeDirAll(dir string) {
@@ -210,16 +217,6 @@ func MakeDirAll(dir string) {
 	}
 }
 
-func setDisabledPluginsTxt(prod product.Product, confDir string) {
-	disabledPluginsPathSrc := filepath.Join(prod.Home, "disabled_plugins.txt")
-	disabledPluginsPathDst := filepath.Join(confDir, "disabled_plugins.txt")
-	if _, err := os.Stat(disabledPluginsPathSrc); err == nil {
-		if err := cp.Copy(disabledPluginsPathSrc, disabledPluginsPathDst); err != nil {
-			log.Fatal(err)
-		}
-	}
-}
-
 func addKeepassIDEConfig(ideaOptions string) {
 	if //goland:noinspection ALL
 	runtime.GOOS != "darwin" && runtime.GOOS != "windows" {
diff --git a/platform/product/product_info.go b/platform/product/product_info.go
@@ -77,7 +77,19 @@ func ideBin(home string) string {
 }
 
 func (p Product) CustomPluginsPath() string {
-	return filepath.Join(p.Home, "custom-plugins")
+	base, err := os.UserConfigDir()
+	if err != nil {
+		log.Fatal(err)
+	}
+	return filepath.Join(base, "JetBrains", "Qodana", p.Code, p.GetVersionBranch(), "custom-plugins")
+}
+
+func (p Product) DisabledPluginsFilePath() string {
+	base, err := os.UserConfigDir()
+	if err != nil {
+		log.Fatal(err)
+	}
+	return filepath.Join(base, "JetBrains", "Qodana", p.Code, p.GetVersionBranch(), "disabled_plugins.txt")
 }
 
 func (p Product) javaHome() string {
