Skip to content

Commit 08dfdba

Browse files
pavelfatinbuilduser
authored andcommitted
X-Ray: enable in .mill files, #SCL-24263 fixed
(cherry picked from commit e195364)
1 parent 16a28dc commit 08dfdba

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

scala/codeInsight/src/org/jetbrains/plugins/scala/codeInsight/hints/ScalaEditorFactoryListener.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class ScalaEditorFactoryListener extends EditorFactoryListener {
4949

5050
override def editorCreated(event: EditorFactoryEvent): Unit = {
5151
val file = event.getEditor.getVirtualFile
52-
if (file == null || file.getExtension != "scala" && file.getExtension != "sc" && file.getExtension != "sbt") return
52+
if (file == null || file.getExtension != "scala" && file.getExtension != "sc" && file.getExtension != "sbt" && file.getExtension != "mill") return
5353

5454
val component = event.getEditor.getContentComponent
5555
component.addFocusListener(editorFocusListener)

scala/codeInsight/src/org/jetbrains/plugins/scala/codeInsight/hints/XRayModeWidgetActionProvider.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class XRayModeWidgetActionProvider extends InspectionWidgetActionProvider {
3333
if (project == null || project.isDefault) return null
3434

3535
val file = editor.getVirtualFile
36-
if (file == null || file.getExtension != "scala" && file.getExtension != "sc" && file.getExtension != "sbt") return null
36+
if (file == null || file.getExtension != "scala" && file.getExtension != "sc" && file.getExtension != "sbt" && file.getExtension != "mill") return null
3737

3838
val action = new DumbAwareAction(ScalaCodeInsightBundle.message("xray.mode.widget.text")) with CustomComponentAction {
3939
override def getActionUpdateThread: ActionUpdateThread = ActionUpdateThread.EDT

scala/codeInsight/src/org/jetbrains/plugins/scala/codeInsight/implicits/MouseHandler.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ private final class MouseHandler extends ProjectActivity {
167167

168168
def isScalaFile = {
169169
val file = e.getEditor.getVirtualFile
170-
file != null && (file.getExtension == "scala" || file.getExtension == "sc" || file.getExtension == "sbt")
170+
file != null && (file.getExtension == "scala" || file.getExtension == "sc" || file.getExtension == "sbt" || file.getExtension == "mill")
171171
}
172172

173173
def checkSettings = {

scala/scala-impl/src/org/jetbrains/plugins/scala/incremental/package.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,5 @@ package object incremental {
4444
}
4545

4646
private[incremental] def isScalaIn(file: VirtualFile): Boolean =
47-
file != null && (file.getExtension == "scala" || file.getExtension == "sc" || file.getExtension == "sbt")
47+
file != null && (file.getExtension == "scala" || file.getExtension == "sc" || file.getExtension == "sbt" || file.getExtension == "mill")
4848
}

0 commit comments

Comments
 (0)