diff options
| author | Kun Shen <kunshen@google.com> | 2022-01-31 17:03:13 -0800 |
|---|---|---|
| committer | Kun Shen <kunshen@google.com> | 2022-02-01 20:56:23 +0000 |
| commit | f320d428117a4c6b145569960da75a6cffbb6b49 (patch) | |
| tree | 44ce4b05561ac76fd2ad43bb5a8251bdbb17fe5c /android-lint/src | |
| parent | 98ee934a6e90b853f250d72942ef106780b923f2 (diff) | |
| download | idea-f320d428117a4c6b145569960da75a6cffbb6b49.tar.gz | |
Move check `requiresAndroidModel` util to ProjectSystemUtil
Bug: wip
Test: updated
Change-Id: If386650546a0fdb7915afd0a5704eb930d8e5c54
Diffstat (limited to 'android-lint/src')
| -rw-r--r-- | android-lint/src/com/android/tools/idea/lint/AndroidLintIdeClient.java | 4 | ||||
| -rw-r--r-- | android-lint/src/com/android/tools/idea/lint/AndroidLintIdeSupport.kt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/android-lint/src/com/android/tools/idea/lint/AndroidLintIdeClient.java b/android-lint/src/com/android/tools/idea/lint/AndroidLintIdeClient.java index b1fab5de2e9..d4233575820 100644 --- a/android-lint/src/com/android/tools/idea/lint/AndroidLintIdeClient.java +++ b/android-lint/src/com/android/tools/idea/lint/AndroidLintIdeClient.java @@ -38,8 +38,8 @@ import com.android.tools.idea.lint.common.LintResult; import com.android.tools.idea.model.AndroidModel; import com.android.tools.idea.model.MergedManifestManager; import com.android.tools.idea.model.MergedManifestSnapshot; -import com.android.tools.idea.project.AndroidProjectInfo; import com.android.tools.idea.projectsystem.IdeaSourceProvider; +import com.android.tools.idea.projectsystem.ProjectSystemUtil; import com.android.tools.idea.res.FileResourceReader; import com.android.tools.idea.res.FrameworkResourceRepositoryManager; import com.android.tools.idea.res.IdeResourcesUtil; @@ -240,7 +240,7 @@ public class AndroidLintIdeClient extends LintIdeClient { AndroidFacet facet = AndroidFacet.getInstance(module); return facet != null && AndroidModel.isRequired(facet); } - return AndroidProjectInfo.getInstance(myProject).requiresAndroidModel(); + return ProjectSystemUtil.requiresAndroidModel(myProject); } @Nullable diff --git a/android-lint/src/com/android/tools/idea/lint/AndroidLintIdeSupport.kt b/android-lint/src/com/android/tools/idea/lint/AndroidLintIdeSupport.kt index fa2949d30dd..3389b240575 100644 --- a/android-lint/src/com/android/tools/idea/lint/AndroidLintIdeSupport.kt +++ b/android-lint/src/com/android/tools/idea/lint/AndroidLintIdeSupport.kt @@ -35,7 +35,6 @@ import com.android.tools.idea.lint.common.LintIdeClient import com.android.tools.idea.lint.common.LintIdeSupport import com.android.tools.idea.lint.common.LintResult import com.android.tools.idea.lint.common.getModuleDir -import com.android.tools.idea.project.AndroidProjectInfo import com.android.tools.idea.projectsystem.ProjectSystemSyncManager import com.android.tools.idea.projectsystem.getModuleSystem import com.android.tools.idea.projectsystem.getProjectSystem @@ -43,6 +42,7 @@ import com.android.tools.idea.res.AndroidFileChangeListener import com.android.tools.idea.sdk.AndroidSdks import com.android.tools.idea.sdk.StudioSdkUtil import com.android.tools.idea.progress.StudioLoggerProgressIndicator +import com.android.tools.idea.projectsystem.requiresAndroidModel import com.android.tools.lint.client.api.IssueRegistry import com.android.tools.lint.client.api.LintDriver import com.android.tools.lint.detector.api.Issue @@ -158,7 +158,7 @@ class AndroidLintIdeSupport : LintIdeSupport() { else if (file.isGradleFile()) { // Ensure that we're listening to the PSI structure for Gradle file edit notifications val project = file.project - if (AndroidProjectInfo.getInstance(project).requiresAndroidModel()) { + if (project.requiresAndroidModel()) { AndroidFileChangeListener.getInstance(project) } return true |