MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-04 17:20:55 +07:00
Code Issues Packages Projects Releases Wiki Activity

[NPW FUS] fix: returned OTHER filed for languages and build systems

Browse Source 
GitOrigin-RevId: d911963d163507c1e23960acd5b38571dbe9500a
This commit is contained in:
Sergei Vorobyov
2023-05-16 12:58:06 +02:00
committed by intellij-monorepo-bot
parent 44ee7eec41
commit 0a2276866a
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
platform/platform-impl/src/com/intellij/ide/projectWizard/NewProjectWizardCollector.kt
View File

@@ -1,7 +1,6 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.ide.projectWizard package com.intellij.ide.projectWizard
import com.intellij.ide.projectWizard.NewProjectWizardConstants.OTHER
import com.intellij.ide.util.projectWizard.ModuleBuilder import com.intellij.ide.util.projectWizard.ModuleBuilder
import com.intellij.ide.util.projectWizard.WizardContext import com.intellij.ide.util.projectWizard.WizardContext
import com.intellij.ide.wizard.BuildSystemNewProjectWizardData import com.intellij.ide.wizard.BuildSystemNewProjectWizardData
@@ -30,7 +29,7 @@ class NewProjectWizardCollector : CounterUsagesCollector() {
companion object { companion object {
private val GROUP = EventLogGroup("new.project.wizard.interactions", 21) private val GROUP = EventLogGroup("new.project.wizard.interactions", 22)
private val LANGUAGES = listOf( private val LANGUAGES = listOf(
NewProjectWizardConstants.Language.JAVA, NewProjectWizardConstants.Language.KOTLIN, NewProjectWizardConstants.Language.JAVA, NewProjectWizardConstants.Language.KOTLIN,
@@ -38,12 +37,13 @@ class NewProjectWizardCollector : CounterUsagesCollector() {
NewProjectWizardConstants.Language.HTML, NewProjectWizardConstants.Language.PYTHON, NewProjectWizardConstants.Language.HTML, NewProjectWizardConstants.Language.PYTHON,
NewProjectWizardConstants.Language.PHP, NewProjectWizardConstants.Language.RUBY, NewProjectWizardConstants.Language.PHP, NewProjectWizardConstants.Language.RUBY,
NewProjectWizardConstants.Language.GO, NewProjectWizardConstants.Language.SCALA, NewProjectWizardConstants.Language.GO, NewProjectWizardConstants.Language.SCALA,
NewProjectWizardConstants.Language.RUST NewProjectWizardConstants.Language.RUST, NewProjectWizardConstants.OTHER
) )
private val BUILD_SYSTEMS = listOf( private val BUILD_SYSTEMS = listOf(
NewProjectWizardConstants.BuildSystem.INTELLIJ, NewProjectWizardConstants.BuildSystem.GRADLE, NewProjectWizardConstants.BuildSystem.INTELLIJ, NewProjectWizardConstants.BuildSystem.GRADLE,
NewProjectWizardConstants.BuildSystem.MAVEN, NewProjectWizardConstants.BuildSystem.SBT NewProjectWizardConstants.BuildSystem.MAVEN, NewProjectWizardConstants.BuildSystem.SBT,
NewProjectWizardConstants.OTHER
) )
private val GROOVY_SDKS = listOf( private val GROOVY_SDKS = listOf(
@@ -184,11 +184,11 @@ class NewProjectWizardCollector : CounterUsagesCollector() {
private val NewProjectWizardStep.language: String private val NewProjectWizardStep.language: String
get() = (this as? LanguageNewProjectWizardData)?.language get() = (this as? LanguageNewProjectWizardData)?.language
?: data.getUserData(LanguageNewProjectWizardData.KEY)?.language ?: data.getUserData(LanguageNewProjectWizardData.KEY)?.language
?: OTHER ?: NewProjectWizardConstants.OTHER
private val NewProjectWizardStep.buildSystem: String private val NewProjectWizardStep.buildSystem: String
get() = (this as? BuildSystemNewProjectWizardData)?.buildSystem get() = (this as? BuildSystemNewProjectWizardData)?.buildSystem
?: OTHER ?: NewProjectWizardConstants.OTHER
} }
object Base { object Base {
@@ -294,7 +294,8 @@ class NewProjectWizardCollector : CounterUsagesCollector() {
override fun addData(fuData: FeatureUsageData, value: ModuleBuilder?) { override fun addData(fuData: FeatureUsageData, value: ModuleBuilder?) {
fuData.addPluginInfo(value?.let { getPluginInfo(it.javaClass) }) fuData.addPluginInfo(value?.let { getPluginInfo(it.javaClass) })
fuData.addData(name, value?.builderId?.removePrefix(NPW_PREFIX) ?: OTHER) val builderId = value?.builderId?.removePrefix(NPW_PREFIX)
fuData.addData(name, builderId ?: NewProjectWizardConstants.OTHER)
} }
override val validationRule: List<String> override val validationRule: List<String>
@@ -305,7 +306,9 @@ class NewProjectWizardCollector : CounterUsagesCollector() {
override fun getRuleId(): String = ID override fun getRuleId(): String = ID
override fun doValidate(data: String, context: EventContext): ValidationResultType { override fun doValidate(data: String, context: EventContext): ValidationResultType {
if (isThirdPartyValue(data) || OTHER == data) return ValidationResultType.ACCEPTED if (isThirdPartyValue(data) || NewProjectWizardConstants.OTHER == data) {
return ValidationResultType.ACCEPTED
}
return acceptWhenReportedByPluginFromPluginRepository(context) return acceptWhenReportedByPluginFromPluginRepository(context)
} }