Review 4ian#3

Bouh · Jan 31, 2020 · 5d2cd25 · 5d2cd25
1 parent da03e19
commit 5d2cd25
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/Core/GDCore/IDE/Events/EventsRefactorer.cpp b/Core/GDCore/IDE/Events/EventsRefactorer.cpp
@@ -633,18 +633,18 @@ vector<EventsSearchResult> EventsRefactorer::SearchInEvents(
     }
 
     if (inComments) {
-      vector<gd::String> stringsVectors = events[i].GetAllSearchableStrings();
+      ///vector<gd::String> stringsVectors = events[i].GetAllSearchableStrings();
 
-      for (std::size_t j = 0; j < stringsVectors.size(); ++j) {
+      ///for (std::size_t j = 0; j < stringsVectors.size(); ++j) {
         if (!eventAddedInResults &&
-            SearchStringInComments(
-                project, layout, stringsVectors[j], search, matchCase)) {
+            SearchStringInEvents(
+                project, layout, events[i], search, matchCase)) {
           results.push_back(EventsSearchResult(
               std::weak_ptr<gd::BaseEvent>(events.GetEventSmartPtr(i)),
               &events,
               i));
         }
-      }
+      ///}
     }
 
     if (events[i].CanHaveSubEvents()) {
@@ -728,20 +728,20 @@ bool EventsRefactorer::SearchStringInConditions(
   return false;
 }
 
-bool EventsRefactorer::SearchStringInComments(gd::ObjectsContainer& project,
+bool EventsRefactorer::SearchStringInEvents(gd::ObjectsContainer& project,
                                                gd::ObjectsContainer& layout,
-                                               gd::EventsList& events,
+                                               gd::BaseEvent& event,
                                                gd::String search,
                                                bool matchCase) {
-  for (gd::BaseEvent event : events) {
+  ///for (gd::BaseEvent event : events) {
     for (gd::String str : event.GetAllSearchableStrings()) {
       if (matchCase) {
         if (str.find(search) != gd::String::npos) return true;
       } else {
         if (str.FindCaseInsensitive(search) != gd::String::npos) return true;
       }
     }
-  }
+  ///}
 
   return false;
 }

diff --git a/Core/GDCore/IDE/Events/EventsRefactorer.h b/Core/GDCore/IDE/Events/EventsRefactorer.h
@@ -203,9 +203,9 @@ class GD_CORE_API EventsRefactorer {
                                        gd::InstructionsList& conditions,
                                        gd::String search,
                                        bool matchCase);
-  static bool SearchStringInComments(gd::ObjectsContainer& project,
+  static bool SearchStringInEvents(gd::ObjectsContainer& project,
                                        gd::ObjectsContainer& layout,
-                                       gd::EventsList& events,
+                                       gd::BaseEvent& events,
                                        gd::String search,
                                        bool matchCase);
 

diff --git a/GDevelop.js/Bindings/Bindings.idl b/GDevelop.js/Bindings/Bindings.idl
@@ -1529,7 +1529,6 @@ interface EventsRefactorer {
     void STATIC_RemoveObjectInEvents([Const, Ref] Platform platform, [Ref] ObjectsContainer project, [Ref] ObjectsContainer layout, [Ref] EventsList events, [Const] DOMString name);
     void STATIC_ReplaceStringInEvents([Ref] ObjectsContainer project, [Ref] ObjectsContainer layout, [Ref] EventsList events, [Const] DOMString toReplace, [Const] DOMString newString, boolean matchCase, boolean inConditions, boolean inActions);
     [Value] VectorEventsSearchResult STATIC_SearchInEvents([Ref] ObjectsContainer project, [Ref] ObjectsContainer layout, [Ref] EventsList events, [Const] DOMString search, boolean matchCase, boolean inConditions, boolean inActions, boolean inComments);
-    [Value] VectorEventsSearchResult STATIC_GetAllSearchableStrings([Ref] ObjectsContainer project, [Ref] ObjectsContainer layout, [Ref] EventsList events, [Const] DOMString search, boolean matchCase);
 };
 
 interface WholeProjectRefactorer {

diff --git a/newIDE/app/src/EventsSheet/SearchPanel.js b/newIDE/app/src/EventsSheet/SearchPanel.js
@@ -31,6 +31,7 @@ type State = {|
   matchCase: boolean,
   searchInActions: boolean,
   searchInConditions: boolean,
+  searchInComments: boolean,
   searchInSelection: boolean,
 |};
 
@@ -42,6 +43,7 @@ export default class SearchPanel extends PureComponent<Props, State> {
     matchCase: false,
     searchInActions: true,
     searchInConditions: true,
+    searchInComments: true,
     searchInSelection: false,
   };
 
@@ -58,13 +60,15 @@ export default class SearchPanel extends PureComponent<Props, State> {
       matchCase,
       searchInActions,
       searchInConditions,
+      searchInComments,
     } = this.state;
     this.props.onSearchInEvents({
       searchInSelection,
       searchText,
       matchCase,
       searchInActions,
       searchInConditions,
+      searchInComments,
     });
   };
 
@@ -76,6 +80,7 @@ export default class SearchPanel extends PureComponent<Props, State> {
       matchCase,
       searchInActions,
       searchInConditions,
+      searchInComments,
     } = this.state;
 
     this.launchSearch();
@@ -87,6 +92,7 @@ export default class SearchPanel extends PureComponent<Props, State> {
       matchCase,
       searchInActions,
       searchInConditions,
+      searchInComments,
     });
   };