Disable auto completion if completionWordTypes is empty

1024jp · 1024jp · commit 3ed5d14b3da1 · 2024-03-04T21:24:26.000+09:00
diff --git a/CotEditor/Sources/EditorTextView.swift b/CotEditor/Sources/EditorTextView.swift
@@ -1366,7 +1366,7 @@ class EditorTextView: NSTextView, Themable, CurrentLineHighlighting, MultiCursor
         self.isGrammarCheckingEnabled = mode.grammarChecking
         self.isAutomaticSpellingCorrectionEnabled = mode.automaticSpellingCorrection
         
-        self.isAutomaticCompletionEnabled = mode.automaticCompletion
+        self.isAutomaticCompletionEnabled = mode.automaticCompletion && !mode.completionWordTypes.isEmpty
     }
     
     
diff --git a/CotEditor/Sources/ModeSettingsView.swift b/CotEditor/Sources/ModeSettingsView.swift
@@ -226,6 +226,7 @@ private struct ModeOptionsView: View {
                     }.padding(.leading, 20)
                     Toggle(String(localized: "Suggest completions while typing", table: "ModeSettings"),
                            isOn: $options.automaticCompletion)
+                    .disabled(self.options.completionWordTypes.isEmpty)
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -1366,7 +1366,7 @@ class EditorTextView: NSTextView, Themable, CurrentLineHighlighting, MultiCursor`
`1366`	`1366`	`self.isGrammarCheckingEnabled = mode.grammarChecking`
`1367`	`1367`	`self.isAutomaticSpellingCorrectionEnabled = mode.automaticSpellingCorrection`
`1368`	`1368`
`1369`		`- self.isAutomaticCompletionEnabled = mode.automaticCompletion`
	`1369`	`+ self.isAutomaticCompletionEnabled = mode.automaticCompletion && !mode.completionWordTypes.isEmpty`
`1370`	`1370`	`}`
`1371`	`1371`
`1372`	`1372`
Original file line number	Diff line number	Diff line change
`@@ -226,6 +226,7 @@ private struct ModeOptionsView: View {`
`226`	`226`	`}.padding(.leading, 20)`
`227`	`227`	`Toggle(String(localized: "Suggest completions while typing", table: "ModeSettings"),`
`228`	`228`	`isOn: $options.automaticCompletion)`
	`229`	`+ .disabled(self.options.completionWordTypes.isEmpty)`
`229`	`230`	`}`
`230`	`231`	`}`
`231`	`232`	`}`