Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GHI-161: conflict between ZE and FM fixed #164

Merged
merged 1 commit into from
Nov 14, 2023
Merged

GHI-161: conflict between ZE and FM fixed #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/kotlin/org/zowe/explorer/editor/inspection/MFLossyEncodingInspection.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import java.nio.charset.CodingErrorAction
class MFLossyEncodingInspection : LocalInspectionTool() {

override fun getShortName(): String {
return "MFLossyEncoding"
return "ZoweMFLossyEncoding"
}

override fun checkFile(file: PsiFile, manager: InspectionManager, isOnTheFly: Boolean): Array<ProblemDescriptor>? {
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/org/zowe/explorer/utils/encodingUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ fun checkEncodingCompatibility(file: VirtualFile, project: Project): Boolean {
val psiFile = PsiManager.getInstance(project).findFile(file)
psiFile?.let {
val inspectionProfile = InspectionProjectProfileManager.getInstance(project).currentProfile
val inspectionTool = inspectionProfile.getInspectionTool("MFLossyEncoding", project)
val inspectionTool = inspectionProfile.getInspectionTool("ZoweMFLossyEncoding", project)
inspectionTool?.let { tool ->
val inspectionManager = InspectionManager.getInstance(project)
val descriptors =
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/META-INF/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ Thank you for considering IBA Group for your mainframe needs.
order="after org.zowe.explorer.editor.status.MfLineSeparatorWidgetFactory, before powerStatus"/>

<!-- TODO: define attribute language="" in v1.*.*-223 and greater -->
<localInspection shortName="MFLossyEncoding" displayName="MF lossy encoding"
<localInspection shortName="ZoweMFLossyEncoding" displayName="Zowe MF lossy encoding"
groupBundle="messages.InspectionsBundle" groupKey="group.names.internationalization.issues"
enabledByDefault="true" level="WARNING"
implementationClass="org.zowe.explorer.editor.inspection.MFLossyEncodingInspection"/>
Expand Down
0 ...spectionDescriptions/MFLossyEncoding.html → ...tionDescriptions/ZoweMFLossyEncoding.html
View file
Open in desktop
File renamed without changes.
Loading