clean up

eyelash · Sep 25, 2023 · e74bf91 · e74bf91
1 parent 991c7b4
commit e74bf91
Show file tree

Hide file tree

Showing 22 changed files with 140 additions and 144 deletions.
diff --git a/atom/src/bracket-matcher-view.cc b/atom/src/bracket-matcher-view.cc
@@ -80,7 +80,7 @@ void BracketMatcherView::updateMatch() {
   this->tagHighlighted = highlightTag;
 }
 
-optional<Point> BracketMatcherView::findMatchingEndBracket(Point startBracketPosition, char16_t startBracket, char16_t endBracket) {
+optional<Point> BracketMatcherView::findMatchingEndBracket(const Point &startBracketPosition, char16_t startBracket, char16_t endBracket) {
   if (startBracket == endBracket) return optional<Point>();
 
   if (TreeSitterLanguageMode *languageMode = this->hasSyntaxTree()) {
@@ -90,7 +90,7 @@ optional<Point> BracketMatcherView::findMatchingEndBracket(Point startBracketPos
   }
 }
 
-optional<Point> BracketMatcherView::findMatchingStartBracket(Point endBracketPosition, char16_t startBracket, char16_t endBracket) {
+optional<Point> BracketMatcherView::findMatchingStartBracket(const Point &endBracketPosition, char16_t startBracket, char16_t endBracket) {
   if (startBracket == endBracket) return optional<Point>();
 
   if (TreeSitterLanguageMode *languageMode = this->hasSyntaxTree()) {
@@ -111,7 +111,7 @@ template <typename T> static Range rangeForNode(T node) {
   return Range(startPosition(node), endPosition(node));
 }
 
-optional<Point> BracketMatcherView::findMatchingEndBracketWithSyntaxTree(Point bracketPosition, char16_t startBracket, char16_t endBracket, TreeSitterLanguageMode *languageMode) {
+optional<Point> BracketMatcherView::findMatchingEndBracketWithSyntaxTree(const Point &bracketPosition, char16_t startBracket, char16_t endBracket, TreeSitterLanguageMode *languageMode) {
   optional<Point> result;
   const Point bracketEndPosition = bracketPosition.traverse({0, 1});
   languageMode->getSyntaxNodeContainingRange(
@@ -131,7 +131,7 @@ optional<Point> BracketMatcherView::findMatchingEndBracketWithSyntaxTree(Point b
   return result;
 }
 
-optional<Point> BracketMatcherView::findMatchingStartBracketWithSyntaxTree(Point bracketPosition, char16_t startBracket, char16_t endBracket, TreeSitterLanguageMode *languageMode) {
+optional<Point> BracketMatcherView::findMatchingStartBracketWithSyntaxTree(const Point &bracketPosition, char16_t startBracket, char16_t endBracket, TreeSitterLanguageMode *languageMode) {
   optional<Point> result;
   const Point bracketEndPosition = bracketPosition.traverse({0, 1});
   languageMode->getSyntaxNodeContainingRange(
@@ -206,7 +206,7 @@ std::pair<optional<TSNode>, optional<TSNode>> BracketMatcherView::findContaining
   return {startTag, endTag};
 }
 
-DisplayMarker *BracketMatcherView::createMarker(Range bufferRange) {
+DisplayMarker *BracketMatcherView::createMarker(const Range &bufferRange) {
   DisplayMarker *marker = this->editor->markBufferRange(bufferRange);
   this->editor->decorateMarker(marker, {Decoration::Type::highlight, "bracket-matcher"});
   return marker;

diff --git a/atom/src/bracket-matcher-view.h b/atom/src/bracket-matcher-view.h
@@ -23,13 +23,13 @@ struct BracketMatcherView {
   ~BracketMatcherView();
 
   void updateMatch();
-  optional<Point> findMatchingEndBracket(Point, char16_t, char16_t);
-  optional<Point> findMatchingStartBracket(Point, char16_t, char16_t);
-  optional<Point> findMatchingEndBracketWithSyntaxTree(Point, char16_t, char16_t, TreeSitterLanguageMode *);
-  optional<Point> findMatchingStartBracketWithSyntaxTree(Point, char16_t, char16_t, TreeSitterLanguageMode *);
+  optional<Point> findMatchingEndBracket(const Point &, char16_t, char16_t);
+  optional<Point> findMatchingStartBracket(const Point &, char16_t, char16_t);
+  optional<Point> findMatchingEndBracketWithSyntaxTree(const Point &, char16_t, char16_t, TreeSitterLanguageMode *);
+  optional<Point> findMatchingStartBracketWithSyntaxTree(const Point &, char16_t, char16_t, TreeSitterLanguageMode *);
   std::pair<optional<Range>, optional<Range>> findMatchingTagNameRangesWithSyntaxTree(TreeSitterLanguageMode *);
   std::pair<optional<TSNode>, optional<TSNode>> findContainingTagsWithSyntaxTree(Point, TreeSitterLanguageMode *);
-  DisplayMarker *createMarker(Range);
+  DisplayMarker *createMarker(const Range &);
   std::tuple<optional<Point>, optional<Point>> findCurrentPair();
   TreeSitterLanguageMode *hasSyntaxTree();
 };

diff --git a/atom/src/cursor.cc b/atom/src/cursor.cc
@@ -20,21 +20,21 @@ void Cursor::destroy() {
   this->marker->destroy();
 }
 
-void Cursor::setScreenPosition(Point screenPosition, optional<bool> options_autoscroll, DisplayLayer::ClipDirection clipDirection) {
+void Cursor::setScreenPosition(const Point &screenPosition, optional<bool> options_autoscroll, DisplayLayer::ClipDirection clipDirection) {
   this->changePosition(options_autoscroll, [&]() {
     this->marker->setHeadScreenPosition(screenPosition, clipDirection);
   });
 }
 
-void Cursor::setScreenPosition(Point screenPosition, DisplayLayer::ClipDirection clipDirection) {
+void Cursor::setScreenPosition(const Point &screenPosition, DisplayLayer::ClipDirection clipDirection) {
   this->setScreenPosition(screenPosition, optional<bool>(), clipDirection);
 }
 
 Point Cursor::getScreenPosition() {
   return this->marker->getHeadScreenPosition();
 }
 
-void Cursor::setBufferPosition(Point bufferPosition, optional<bool> options_autoscroll) {
+void Cursor::setBufferPosition(const Point &bufferPosition, optional<bool> options_autoscroll) {
   this->changePosition(options_autoscroll, [&]() {
     this->marker->setHeadBufferPosition(bufferPosition);
   });

diff --git a/atom/src/cursor.h b/atom/src/cursor.h
@@ -21,10 +21,10 @@ struct Cursor {
   ~Cursor();
   void destroy();
 
-  void setScreenPosition(Point, optional<bool> = {}, DisplayLayer::ClipDirection = DisplayLayer::ClipDirection::closest);
-  void setScreenPosition(Point, DisplayLayer::ClipDirection);
+  void setScreenPosition(const Point &, optional<bool> = {}, DisplayLayer::ClipDirection = DisplayLayer::ClipDirection::closest);
+  void setScreenPosition(const Point &, DisplayLayer::ClipDirection);
   Point getScreenPosition();
-  void setBufferPosition(Point, optional<bool> = {});
+  void setBufferPosition(const Point &, optional<bool> = {});
   Point getBufferPosition();
   double getScreenRow();
   double getScreenColumn();

diff --git a/atom/src/select-next.cc b/atom/src/select-next.cc
@@ -43,7 +43,7 @@ void SelectNext::selectNextOccurrence(/* options = {} */) {
   }
 }
 
-optional<Range> SelectNext::findNextOccurrence(Range scanRange) {
+optional<Range> SelectNext::findNextOccurrence(const Range &scanRange) {
   optional<Range> foundRange;
   this->scanForNextOccurrence(scanRange, [&](TextBuffer::SearchCallbackArgument &argument) {
     foundRange = argument.range;
@@ -52,13 +52,13 @@ optional<Range> SelectNext::findNextOccurrence(Range scanRange) {
   return foundRange;
 }
 
-void SelectNext::addSelection(Range range) {
+void SelectNext::addSelection(const Range &range) {
   const bool reversed = this->editor->getLastSelection()->isReversed();
   Selection *selection = this->editor->addSelectionForBufferRange(range /* , {reversed} */);
   //return this->updateSavedSelections(selection);
 }
 
-void SelectNext::scanForNextOccurrence(Range range, TextBuffer::ScanIterator callback) {
+void SelectNext::scanForNextOccurrence(const Range &range, TextBuffer::ScanIterator callback) {
   Selection *selection = this->editor->getLastSelection();
   std::u16string text = escapeRegExp(selection->getText());
   if (this->wordSelected) {

diff --git a/atom/src/select-next.h b/atom/src/select-next.h
@@ -16,9 +16,9 @@ struct SelectNext {
   void findAndSelectNext();
   void selectWord();
   void selectNextOccurrence();
-  optional<Range> findNextOccurrence(Range);
-  void addSelection(Range);
-  void scanForNextOccurrence(Range, TextBuffer::ScanIterator);
+  optional<Range> findNextOccurrence(const Range &);
+  void addSelection(const Range &);
+  void scanForNextOccurrence(const Range &, TextBuffer::ScanIterator);
   bool isNonWordCharacter(const std::u16string &);
   bool isNonWordCharacterToTheLeft(Selection *);
   bool isNonWordCharacterToTheRight(Selection *);

diff --git a/atom/src/selection.cc b/atom/src/selection.cc
@@ -55,7 +55,7 @@ Range Selection::getScreenRange() {
   return this->marker->getScreenRange();
 }
 
-void Selection::setScreenRange(Range screenRange, optional<bool> reversed) {
+void Selection::setScreenRange(const Range &screenRange, optional<bool> reversed) {
   return this->setBufferRange(
     this->editor->bufferRangeForScreenRange(screenRange),
     optional<bool>(),
@@ -67,7 +67,7 @@ Range Selection::getBufferRange() {
   return this->marker->getBufferRange();
 }
 
-void Selection::setBufferRange(Range bufferRange, optional<bool> options_autoscroll, optional<bool> reversed) {
+void Selection::setBufferRange(const Range &bufferRange, optional<bool> options_autoscroll, optional<bool> reversed) {
   //if (options.reversed == null) options.reversed = this.isReversed();
   /*if (!options.preserveFolds)
     this.editor.destroyFoldsContainingBufferPositions(
@@ -132,7 +132,7 @@ std::u16string Selection::getText() {
   return this->editor->buffer->getTextInRange(this->getBufferRange());
 }
 
-bool Selection::intersectsBufferRange(Range bufferRange) {
+bool Selection::intersectsBufferRange(const Range &bufferRange) {
   return this->getBufferRange().intersectsWith(bufferRange);
 }
 
@@ -166,7 +166,7 @@ void Selection::clear(optional<bool> options_autoscroll) {
   this->finalize();
 }
 
-void Selection::selectToScreenPosition(Point position) {
+void Selection::selectToScreenPosition(const Point &position) {
   this->modifySelection([&]() {
     if (this->initialScreenRange) {
       if (position.isLessThan(this->initialScreenRange->start)) {
@@ -191,7 +191,7 @@ void Selection::selectToScreenPosition(Point position) {
   });
 }
 
-void Selection::selectToBufferPosition(Point position) {
+void Selection::selectToBufferPosition(const Point &position) {
   this->modifySelection([&]() { this->cursor->setBufferPosition(position); });
 }
 
@@ -740,7 +740,7 @@ int Selection::compare(Selection *otherSelection) {
 Section: Private Utilities
 */
 
-void Selection::setGoalScreenRange(Range range) {
+void Selection::setGoalScreenRange(const Range &range) {
   this->goalScreenRange = range;
 }
 

diff --git a/atom/src/selection.h b/atom/src/selection.h
@@ -31,9 +31,9 @@ struct Selection {
   void onDidChangeRange(std::function<void()>);
   void onDidDestroy(std::function<void()>);
   Range getScreenRange();
-  void setScreenRange(Range, optional<bool> = {});
+  void setScreenRange(const Range &, optional<bool> = {});
   Range getBufferRange();
-  void setBufferRange(Range, optional<bool> = {}, optional<bool> = {});
+  void setBufferRange(const Range &, optional<bool> = {}, optional<bool> = {});
   std::pair<double, double> getBufferRowRange();
   Point getTailScreenPosition();
   Point getTailBufferPosition();
@@ -43,13 +43,13 @@ struct Selection {
   bool isReversed();
   bool isSingleScreenLine();
   std::u16string getText();
-  bool intersectsBufferRange(Range);
+  bool intersectsBufferRange(const Range &);
   bool intersectsScreenRowRange(double, double);
   bool intersectsScreenRow(double);
   bool intersectsWith(Selection *, bool);
   void clear(optional<bool> = {});
-  void selectToScreenPosition(Point position);
-  void selectToBufferPosition(Point);
+  void selectToScreenPosition(const Point &);
+  void selectToBufferPosition(const Point &);
   void selectRight(double = 1);
   void selectLeft(double = 1);
   void selectUp(double = 1);
@@ -98,7 +98,7 @@ struct Selection {
   void addSelectionAbove();
   void merge(Selection *);
   int compare(Selection *);
-  void setGoalScreenRange(Range);
+  void setGoalScreenRange(const Range &);
   Range getGoalScreenRange();
   void markerDidChange();
   void markerDidDestroy();

diff --git a/atom/src/syntax-scope-map.cc b/atom/src/syntax-scope-map.cc
@@ -183,8 +183,8 @@ void SyntaxScopeMap::addSelector(const std::string &selector, std::shared_ptr<Re
   }, selector);
 }
 
-std::shared_ptr<SyntaxScopeMap::Result> SyntaxScopeMap::get(const std::vector<std::string> &nodeTypes, const std::vector<double> &childIndices, bool leafIsNamed) {
-  std::shared_ptr<Result> result;
+SyntaxScopeMap::Result *SyntaxScopeMap::get(const std::vector<std::string> &nodeTypes, const std::vector<double> &childIndices, bool leafIsNamed) {
+  Result *result = nullptr;
   size_t i = nodeTypes.size() - 1;
   Table *currentTable = leafIsNamed
     ? this->namedScopeTable[nodeTypes[i]].get()
@@ -198,7 +198,7 @@ std::shared_ptr<SyntaxScopeMap::Result> SyntaxScopeMap::get(const std::vector<st
     }
 
     if (currentTable->result) {
-      result = currentTable->result;
+      result = currentTable->result.get();
     }
 
     if (i == 0) break;

diff --git a/atom/src/syntax-scope-map.h b/atom/src/syntax-scope-map.h
@@ -30,7 +30,7 @@ struct SyntaxScopeMap {
   ~SyntaxScopeMap();
 
   void addSelector(const std::string &, std::shared_ptr<Result>);
-  std::shared_ptr<Result> get(const std::vector<std::string> &, const std::vector<double> &, bool = true);
+  Result *get(const std::vector<std::string> &, const std::vector<double> &, bool = true);
 };
 
 #endif // SYNTAX_SCOPE_MAP_H_