Migrate python feature trainer to v2

GitOrigin-RevId: 369e795edac8f6b04634fc7ede78dff431d0bc21

python/python-features-trainer/resources/META-INF/python-features-trainer.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<idea-plugin>
-  <extensions defaultExtensionNs="training">
-    <ift.language.extension language="Python" defaultProductName="PyCharm"
-                            implementationClass="com.jetbrains.python.ift.PythonLangSupport"/>
-    <ift.learning.course language="Python" implementationClass="com.jetbrains.python.ift.PythonLearningCourse"/>
-    <ifs.suggesterSupport language="Python" implementationClass="com.jetbrains.python.ifs.PythonSuggesterSupport"/>
-  </extensions>
-</idea-plugin>

python/python-features-trainer/resources/intellij.python.featuresTrainer.xml

@@ -0,0 +1,11 @@
+<idea-plugin package="com.intellij.python.featuresTrainer">
+  <dependencies>
+    <plugin id="training"/>
+  </dependencies>
+  <extensions defaultExtensionNs="training">
+    <ift.language.extension language="Python" defaultProductName="PyCharm"
+                            implementationClass="com.intellij.python.featuresTrainer.ift.PythonLangSupport"/>
+    <ift.learning.course language="Python" implementationClass="com.intellij.python.featuresTrainer.ift.PythonLearningCourse"/>
+    <ifs.suggesterSupport language="Python" implementationClass="com.intellij.python.featuresTrainer.ifs.PythonSuggesterSupport"/>
+  </extensions>
+</idea-plugin>

python/python-features-trainer/src/com/intellij/python/featuresTrainer/ifs/PythonSuggesterSupport.kt

@@ -1,4 +1,4 @@
-package com.jetbrains.python.ifs
+package com.intellij.python.featuresTrainer.ifs
 
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile

python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/PythonBasedLangSupport.kt

@@ -1,5 +1,5 @@
 // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.jetbrains.python.ift
+package com.intellij.python.featuresTrainer.ift
 
 import com.intellij.ide.impl.OpenProjectTask
 import com.intellij.openapi.application.ApplicationManager

python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/PythonLangSupport.kt

@@ -1,5 +1,5 @@
 // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.jetbrains.python.ift
+package com.intellij.python.featuresTrainer.ift
 
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VirtualFile

python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/PythonLearningCourse.kt

@@ -1,24 +1,24 @@
 // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.jetbrains.python.ift
+package com.intellij.python.featuresTrainer.ift
 
 import com.intellij.util.PlatformUtils
 import com.jetbrains.python.PythonLanguage
-import com.jetbrains.python.ift.lesson.assistance.PythonEditorCodingAssistanceLesson
-import com.jetbrains.python.ift.lesson.basic.PythonContextActionsLesson
-import com.jetbrains.python.ift.lesson.basic.PythonSelectLesson
-import com.jetbrains.python.ift.lesson.basic.PythonSurroundAndUnwrapLesson
-import com.jetbrains.python.ift.lesson.completion.*
-import com.jetbrains.python.ift.lesson.essensial.PythonOnboardingTourLesson
-import com.jetbrains.python.ift.lesson.navigation.PythonDeclarationAndUsagesLesson
-import com.jetbrains.python.ift.lesson.navigation.PythonFileStructureLesson
-import com.jetbrains.python.ift.lesson.navigation.PythonRecentFilesLesson
-import com.jetbrains.python.ift.lesson.navigation.PythonSearchEverywhereLesson
-import com.jetbrains.python.ift.lesson.refactorings.PythonInPlaceRefactoringLesson
-import com.jetbrains.python.ift.lesson.refactorings.PythonQuickFixesRefactoringLesson
-import com.jetbrains.python.ift.lesson.refactorings.PythonRefactorMenuLesson
-import com.jetbrains.python.ift.lesson.refactorings.PythonRenameLesson
-import com.jetbrains.python.ift.lesson.run.PythonDebugLesson
-import com.jetbrains.python.ift.lesson.run.PythonRunConfigurationLesson
+import com.intellij.python.featuresTrainer.ift.lesson.assistance.PythonEditorCodingAssistanceLesson
+import com.intellij.python.featuresTrainer.ift.lesson.basic.PythonContextActionsLesson
+import com.intellij.python.featuresTrainer.ift.lesson.basic.PythonSelectLesson
+import com.intellij.python.featuresTrainer.ift.lesson.basic.PythonSurroundAndUnwrapLesson
+import com.intellij.python.featuresTrainer.ift.lesson.completion.*
+import com.intellij.python.featuresTrainer.ift.lesson.essensial.PythonOnboardingTourLesson
+import com.intellij.python.featuresTrainer.ift.lesson.navigation.PythonDeclarationAndUsagesLesson
+import com.intellij.python.featuresTrainer.ift.lesson.navigation.PythonFileStructureLesson
+import com.intellij.python.featuresTrainer.ift.lesson.navigation.PythonRecentFilesLesson
+import com.intellij.python.featuresTrainer.ift.lesson.navigation.PythonSearchEverywhereLesson
+import com.intellij.python.featuresTrainer.ift.lesson.refactorings.PythonInPlaceRefactoringLesson
+import com.intellij.python.featuresTrainer.ift.lesson.refactorings.PythonQuickFixesRefactoringLesson
+import com.intellij.python.featuresTrainer.ift.lesson.refactorings.PythonRefactorMenuLesson
+import com.intellij.python.featuresTrainer.ift.lesson.refactorings.PythonRenameLesson
+import com.intellij.python.featuresTrainer.ift.lesson.run.PythonDebugLesson
+import com.intellij.python.featuresTrainer.ift.lesson.run.PythonRunConfigurationLesson
 import training.dsl.LessonUtil
 import training.learn.CourseManager
 import training.learn.LessonsBundle

python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/PythonLessonsBundle.kt

@@ -1,5 +1,5 @@
 // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.jetbrains.python.ift
+package com.intellij.python.featuresTrainer.ift
 
 import com.intellij.DynamicBundle
 import org.jetbrains.annotations.Nls

python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/PythonLessonsUtil.kt

@@ -1,4 +1,4 @@
-package com.jetbrains.python.ift
+package com.intellij.python.featuresTrainer.ift
 
 import com.intellij.ide.util.PropertiesComponent
 import com.intellij.openapi.application.ApplicationManager

python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/lesson/assistance/PythonEditorCodingAssistanceLesson.kt

@@ -1,10 +1,10 @@
 // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.jetbrains.python.ift.lesson.assistance
+package com.intellij.python.featuresTrainer.ift.lesson.assistance
 
 import com.intellij.codeInsight.daemon.impl.runActionCustomShortcutSet
 import com.intellij.openapi.actionSystem.KeyboardShortcut
 import com.jetbrains.python.PyPsiBundle
-import com.jetbrains.python.ift.PythonLessonsBundle
+import com.intellij.python.featuresTrainer.ift.PythonLessonsBundle
 import training.dsl.LearningDslBase
 import training.dsl.LessonSample
 import training.dsl.LessonUtil

python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/lesson/basic/PythonContextActionsLesson.kt

@@ -1,4 +1,4 @@
-package com.jetbrains.python.ift.lesson.basic
+package com.intellij.python.featuresTrainer.ift.lesson.basic
 
 import com.jetbrains.python.PyPsiBundle
 import training.dsl.LessonSample

python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/lesson/basic/PythonSelectLesson.kt

@@ -1,5 +1,5 @@
 // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.jetbrains.python.ift.lesson.basic
+package com.intellij.python.featuresTrainer.ift.lesson.basic
 
 import org.jetbrains.annotations.Nls
 import training.dsl.LessonSample

python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/lesson/basic/PythonSurroundAndUnwrapLesson.kt

@@ -1,5 +1,5 @@
 // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.jetbrains.python.ift.lesson.basic
+package com.intellij.python.featuresTrainer.ift.lesson.basic
 
 import com.jetbrains.python.PyBundle
 import training.dsl.LessonSample

python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/lesson/completion/FStringCompletionLesson.kt

@@ -1,8 +1,8 @@
 // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.jetbrains.python.ift.lesson.completion
+package com.intellij.python.featuresTrainer.ift.lesson.completion
 
-import com.jetbrains.python.ift.PythonLessonsBundle
-import com.jetbrains.python.ift.PythonLessonsUtil.showWarningIfPython3NotFound
+import com.intellij.python.featuresTrainer.ift.PythonLessonsBundle
+import com.intellij.python.featuresTrainer.ift.PythonLessonsUtil.showWarningIfPython3NotFound
 import training.dsl.LessonContext
 import training.dsl.LessonUtil
 import training.dsl.LessonUtil.checkExpectedStateOfEditor

python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/lesson/completion/PythonBasicCompletionLesson.kt

@@ -1,5 +1,5 @@
 // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.jetbrains.python.ift.lesson.completion
+package com.intellij.python.featuresTrainer.ift.lesson.completion
 
 import training.dsl.parseLessonSample
 import training.learn.lesson.general.completion.BasicCompletionLessonBase

python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/lesson/completion/PythonPostfixCompletionLesson.kt

@@ -1,7 +1,7 @@
 // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.jetbrains.python.ift.lesson.completion
+package com.intellij.python.featuresTrainer.ift.lesson.completion
 
-import com.jetbrains.python.ift.PythonLessonsBundle
+import com.intellij.python.featuresTrainer.ift.PythonLessonsBundle
 import training.dsl.LearningDslBase
 import training.dsl.LessonSample
 import training.dsl.parseLessonSample

python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/lesson/completion/PythonSmartCompletionLesson.kt

@@ -1,7 +1,7 @@
 // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.jetbrains.python.ift.lesson.completion
+package com.intellij.python.featuresTrainer.ift.lesson.completion
 
-import com.jetbrains.python.ift.PythonLessonsBundle
+import com.intellij.python.featuresTrainer.ift.PythonLessonsBundle
 import training.dsl.LessonContext
 import training.dsl.LessonUtil
 import training.dsl.LessonUtil.checkExpectedStateOfEditor

python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/lesson/completion/PythonTabCompletionLesson.kt

@@ -1,7 +1,7 @@
 // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.jetbrains.python.ift.lesson.completion
+package com.intellij.python.featuresTrainer.ift.lesson.completion
 
-import com.jetbrains.python.ift.PythonLessonsBundle
+import com.intellij.python.featuresTrainer.ift.PythonLessonsBundle
 import training.dsl.*
 import training.dsl.LessonUtil.checkExpectedStateOfEditor
 import training.learn.course.KLesson

python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/lesson/essensial/PythonOnboardingTourLesson.kt

@@ -1,5 +1,5 @@
 // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.jetbrains.python.ift.lesson.essensial
+package com.intellij.python.featuresTrainer.ift.lesson.essensial
 
 import com.intellij.codeInsight.template.impl.TemplateManagerImpl
 import com.intellij.execution.RunManager
@@ -43,9 +43,9 @@ import com.intellij.util.ui.tree.TreeUtil
 import com.intellij.xdebugger.XDebuggerManager
 import com.jetbrains.python.PyBundle
 import com.jetbrains.python.PyPsiBundle
-import com.jetbrains.python.ift.PythonLessonsBundle
-import com.jetbrains.python.ift.PythonLessonsUtil
 import com.jetbrains.python.sdk.pythonSdk
+import com.intellij.python.featuresTrainer.ift.PythonLessonsBundle
+import com.intellij.python.featuresTrainer.ift.PythonLessonsUtil
 import training.FeaturesTrainerIcons
 import training.dsl.*
 import training.dsl.LessonUtil.adjustSearchEverywherePosition

python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/lesson/navigation/PythonDeclarationAndUsagesLesson.kt

@@ -1,5 +1,5 @@
 // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.jetbrains.python.ift.lesson.navigation
+package com.intellij.python.featuresTrainer.ift.lesson.navigation
 
 import com.intellij.psi.PsiElement
 import com.intellij.psi.util.parentOfType

python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/lesson/navigation/PythonFileStructureLesson.kt

@@ -1,5 +1,5 @@
 // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.jetbrains.python.ift.lesson.navigation
+package com.intellij.python.featuresTrainer.ift.lesson.navigation
 
 import com.intellij.openapi.editor.LogicalPosition
 import training.learn.lesson.general.navigation.FileStructureLesson

python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/lesson/navigation/PythonRecentFilesLesson.kt

@@ -1,5 +1,5 @@
 // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.jetbrains.python.ift.lesson.navigation
+package com.intellij.python.featuresTrainer.ift.lesson.navigation
 
 import training.dsl.LessonContext
 import training.learn.lesson.general.navigation.RecentFilesLesson

python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/lesson/navigation/PythonSearchEverywhereLesson.kt

@@ -1,5 +1,5 @@
 // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.jetbrains.python.ift.lesson.navigation
+package com.intellij.python.featuresTrainer.ift.lesson.navigation
 
 import training.learn.lesson.general.navigation.SearchEverywhereLesson
 

python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/lesson/refactorings/PythonInPlaceRefactoringLesson.kt

@@ -1,9 +1,9 @@
 // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.jetbrains.python.ift.lesson.refactorings
+package com.intellij.python.featuresTrainer.ift.lesson.refactorings
 
 import com.intellij.icons.AllIcons
 import com.intellij.refactoring.RefactoringBundle
-import com.jetbrains.python.ift.PythonLessonsBundle
+import com.intellij.python.featuresTrainer.ift.PythonLessonsBundle
 import training.dsl.*
 import training.dsl.LessonUtil.checkExpectedStateOfEditor
 import training.learn.course.KLesson

python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/lesson/refactorings/PythonQuickFixesRefactoringLesson.kt

@@ -1,5 +1,5 @@
 // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.jetbrains.python.ift.lesson.refactorings
+package com.intellij.python.featuresTrainer.ift.lesson.refactorings
 
 import com.intellij.openapi.application.ModalityState
 import com.intellij.openapi.application.invokeAndWaitIfNeeded
@@ -11,8 +11,8 @@ import com.intellij.ui.components.JBList
 import com.intellij.util.ui.UIUtil
 import com.intellij.util.ui.table.JBTableRow
 import com.jetbrains.python.PyBundle
-import com.jetbrains.python.ift.PythonLessonsBundle
 import com.jetbrains.python.inspections.quickfix.PyChangeSignatureQuickFix
+import com.intellij.python.featuresTrainer.ift.PythonLessonsBundle
 import training.dsl.*
 import training.dsl.LessonUtil.checkExpectedStateOfEditor
 import training.learn.LessonsBundle

python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/lesson/refactorings/PythonRefactorMenuLesson.kt

@@ -1,5 +1,5 @@
 // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.jetbrains.python.ift.lesson.refactorings
+package com.intellij.python.featuresTrainer.ift.lesson.refactorings
 
 import training.dsl.LessonContext
 import training.dsl.parseLessonSample

python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/lesson/refactorings/PythonRenameLesson.kt

@@ -1,5 +1,5 @@
 // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.jetbrains.python.ift.lesson.refactorings
+package com.intellij.python.featuresTrainer.ift.lesson.refactorings
 
 import com.intellij.ide.DataManager
 import com.intellij.ide.actions.exclusion.ExclusionHandler
@@ -8,7 +8,7 @@ import com.intellij.refactoring.ui.NameSuggestionsField
 import com.intellij.ui.tree.TreeVisitor
 import com.intellij.usageView.UsageViewBundle
 import com.intellij.util.ui.tree.TreeUtil
-import com.jetbrains.python.ift.PythonLessonsBundle
+import com.intellij.python.featuresTrainer.ift.PythonLessonsBundle
 import org.assertj.swing.fixture.JTreeFixture
 import training.dsl.*
 import training.learn.LessonsBundle

python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/lesson/run/PythonDebugLesson.kt

@@ -1,9 +1,9 @@
 // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.jetbrains.python.ift.lesson.run
+package com.intellij.python.featuresTrainer.ift.lesson.run
 
 import com.intellij.icons.AllIcons
 import com.intellij.openapi.editor.LogicalPosition
-import com.jetbrains.python.ift.PythonLessonsBundle
+import com.intellij.python.featuresTrainer.ift.PythonLessonsBundle
 import training.dsl.*
 import training.learn.lesson.general.run.CommonDebugLesson
 

python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/lesson/run/PythonRunConfigurationLesson.kt

@@ -1,8 +1,8 @@
 // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.jetbrains.python.ift.lesson.run
+package com.intellij.python.featuresTrainer.ift.lesson.run
 
-import com.jetbrains.python.ift.PythonLessonsBundle
 import com.jetbrains.python.run.PythonRunConfiguration
+import com.intellij.python.featuresTrainer.ift.PythonLessonsBundle
 import training.dsl.*
 import training.learn.lesson.general.run.CommonRunConfigurationLesson
 import training.ui.LearningUiHighlightingManager

python/python-features-trainer/testSrc/com/jetbrains/python/featureTraining/ifs/FileStructureSuggesterPythonTest.kt

@@ -1,5 +1,5 @@
 // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.jetbrains.python.ifs
+package com.intellij.python.featuresTrainer.ifs
 
 import junit.framework.TestCase
 import training.featuresSuggester.FeatureSuggesterTestUtils.focusEditor

python/python-features-trainer/testSrc/com/jetbrains/python/featureTraining/ifs/IntroduceVariableSuggesterPythonTest.kt

@@ -1,5 +1,5 @@
 // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.jetbrains.python.ifs
+package com.intellij.python.featuresTrainer.ifs
 
 import training.featuresSuggester.FeatureSuggesterTestUtils.copyCurrentSelection
 import training.featuresSuggester.FeatureSuggesterTestUtils.cutBetweenLogicalPositions

python/python-features-trainer/testSrc/com/jetbrains/python/featureTraining/ifs/LineCommentingSuggesterPythonTest.kt

@@ -1,5 +1,5 @@
 // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.jetbrains.python.ifs
+package com.intellij.python.featuresTrainer.ifs
 
 import junit.framework.TestCase
 import training.featuresSuggester.FeatureSuggesterTest

python/python-features-trainer/testSrc/com/jetbrains/python/featureTraining/ifs/PythonSuggestersTestUtils.kt

@@ -1,4 +1,4 @@
-package com.jetbrains.python.ifs
+package com.intellij.python.featuresTrainer.ifs
 
 import com.intellij.testFramework.PlatformTestUtil
 import java.io.File

python/python-features-trainer/testSrc/com/jetbrains/python/featureTraining/ifs/ReplaceCompletionSuggesterPythonTest.kt

@@ -1,5 +1,5 @@
 // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.jetbrains.python.ifs
+package com.intellij.python.featuresTrainer.ifs
 
 import training.featuresSuggester.FeatureSuggesterTestUtils.chooseCompletionItem
 import training.featuresSuggester.FeatureSuggesterTestUtils.deleteTextBetweenLogicalPositions

python/python-features-trainer/testSrc/com/jetbrains/python/featureTraining/ift/PythonLessonsAndTipsIntegrationTest.kt

@@ -1,4 +1,4 @@
-package com.jetbrains.python.ift
+package com.intellij.python.featuresTrainer.ift
 
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4