1 files changed, 45 insertions, 2 deletions
diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindSettingsImpl.java b/platform/lang-impl/src/com/intellij/find/impl/FindSettingsImpl.java
index 5fb74f190ac0..c9c8e3492834 100644
--- a/platform/lang-impl/src/com/intellij/find/impl/FindSettingsImpl.java
+++ b/platform/lang-impl/src/com/intellij/find/impl/FindSettingsImpl.java
@@ -103,6 +103,9 @@ public class FindSettingsImpl extends FindSettings implements PersistentStateCom
   @SuppressWarnings({"WeakerAccess"}) public boolean WHOLE_WORDS_ONLY = false;
   @SuppressWarnings({"WeakerAccess"}) public boolean COMMENTS_ONLY = false;
   @SuppressWarnings({"WeakerAccess"}) public boolean STRING_LITERALS_ONLY = false;
+  @SuppressWarnings({"WeakerAccess"}) public boolean EXCEPT_COMMENTS = false;
+  @SuppressWarnings({"WeakerAccess"}) public boolean EXCEPT_COMMENTS_AND_STRING_LITERALS = false;
+  @SuppressWarnings({"WeakerAccess"}) public boolean EXCEPT_STRING_LITERALS = false;
   @SuppressWarnings({"WeakerAccess"}) public boolean LOCAL_WHOLE_WORDS_ONLY = false;
   @SuppressWarnings({"WeakerAccess"}) public boolean REGULAR_EXPRESSIONS = false;
   @SuppressWarnings({"WeakerAccess"}) public boolean LOCAL_REGULAR_EXPRESSIONS = false;
@@ -276,8 +279,18 @@ public class FindSettingsImpl extends FindSettings implements PersistentStateCom
     model.setGlobal(isGlobal());
     model.setRegularExpressions(isRegularExpressions());
     model.setWholeWordsOnly(isWholeWordsOnly());
-    model.setInCommentsOnly(isInCommentsOnly());
-    model.setInStringLiteralsOnly(isInStringLiteralsOnly());
+    FindModel.SearchContext searchContext = isInCommentsOnly() ?
+                                      FindModel.SearchContext.IN_COMMENTS :
+                                      isInStringLiteralsOnly() ?
+                                      FindModel.SearchContext.IN_STRING_LITERALS :
+                                      isExceptComments() ?
+                                      FindModel.SearchContext.EXCEPT_COMMENTS :
+                                      isExceptStringLiterals() ?
+                                      FindModel.SearchContext.EXCEPT_STRING_LITERALS :
+                                      isExceptCommentsAndLiterals() ?
+                                      FindModel.SearchContext.EXCEPT_COMMENTS_AND_STRING_LITERALS :
+                                      FindModel.SearchContext.ANY;
+    model.setSearchContext(searchContext);
     model.setWithSubdirectories(isWithSubdirectories());
     model.setFileFilter(FILE_MASK);
 
@@ -384,4 +397,34 @@ public class FindSettingsImpl extends FindSettings implements PersistentStateCom
   public void setCustomScope(final String SEARCH_SCOPE) {
     this.SEARCH_SCOPE = SEARCH_SCOPE;
   }
+
+  @Override
+  public boolean isExceptComments() {
+    return EXCEPT_COMMENTS;
+  }
+
+  @Override
+  public void setExceptCommentsAndLiterals(boolean selected) {
+    EXCEPT_COMMENTS_AND_STRING_LITERALS = selected;
+  }
+
+  @Override
+  public boolean isExceptCommentsAndLiterals() {
+    return EXCEPT_COMMENTS_AND_STRING_LITERALS;
+  }
+
+  @Override
+  public void setExceptComments(boolean selected) {
+    EXCEPT_COMMENTS = selected;
+  }
+
+  @Override
+  public boolean isExceptStringLiterals() {
+    return EXCEPT_STRING_LITERALS;
+  }
+
+  @Override
+  public void setExceptStringLiterals(boolean selected) {
+    EXCEPT_STRING_LITERALS = selected;
+  }
 }