Fix some English typo

CMakeLists.txt

@@ -879,7 +879,7 @@ endif()
 # add the dtl module include path before we include Plugin folder
 include_directories(submodules/dtl)
 
-# Extran lexers required by CodeLite
+# Extra lexers required by CodeLite
 add_subdirectory(submodules/lexilla)
 
 add_subdirectory(submodules)

CodeFormatter/PHPFormatterBuffer.cpp

@@ -210,7 +210,7 @@ PHPFormatterBuffer& PHPFormatterBuffer::ProcessToken(const phpLexerToken& token)
             m_buffer << token.Text();
 
         } else if(token.type == '!') {
-            // dont add extrace space after the NOT operator
+            // dont add extra space after the NOT operator
             m_buffer << token.Text();
 
         } else if(token.type == kPHP_T_NS_SEPARATOR) {
@@ -293,7 +293,7 @@ wxString PHPFormatterBuffer::FormatDoxyComment(const wxString& comment)
         for(size_t i = 0; i < lines.GetCount(); ++i) {
             lines.Item(i).Trim().Trim(false);
             if(i) {
-                // preprend space + the indent string for every line except for the first line
+                // prepend space + the indent string for every line except for the first line
                 lines.Item(i).Prepend(" ");
                 lines.Item(i).Prepend(indent);
             }
@@ -351,7 +351,7 @@ void PHPFormatterBuffer::format()
             // if(..) <statement> -> if(..)
             //                            <statement>
             // etc.
-            // In addtion, we also handle here the following:
+            // In addition, we also handle here the following:
             // if(something) {} else <statement> =>
             //                                      if(something) {
             //                                      } else

CodeLite/AsyncProcess/TerminalEmulator.cpp

@@ -134,7 +134,7 @@ bool TerminalEmulator::ExecuteNoConsole(const wxString& commandToRun, const wxSt
 #else
     wxString tmpCmd = commandToRun;
     command << "/bin/bash -c '";
-    // escape any single quoutes
+    // escape any single quotes
     tmpCmd.Replace("'", "\\'");
     command << tmpCmd << "'";
 #endif

CodeLite/AsyncProcess/asyncprocess.h

@@ -148,7 +148,7 @@ class WXDLLIMPEXP_CL IProcess : public wxEvtHandler
     virtual void Cleanup() = 0;
 
     // Terminate the process. It is recommended to use this method
-    // so it will invoke the 'Cleaup' procedure and the process
+    // so it will invoke the 'Cleanup' procedure and the process
     // termination event will be sent out
     virtual void Terminate() = 0;
 

CodeLite/AsyncProcess/winprocess_impl.h

@@ -75,7 +75,7 @@ class WXDLLIMPEXP_CL WinProcessImpl : public IProcess
     /**
      * @brief read data from stdout and error
      * @param buff check the buffer when true is returned
-     * @return return true on success or timeout, flase otherwise, incase of false the reader thread will terminate
+     * @return return true on success or timeout, false otherwise, incase of false the reader thread will terminate
      */
     bool Read(wxString& buff, wxString& buffErr, std::string& raw_buff, std::string& raw_buff_err) override;
 

CodeLite/CMakeLists.txt

@@ -69,7 +69,7 @@ if(UNIX)
     if(IS_FREEBSD)
         set(ADDITIONAL_LIBRARIES "-lkvm -lutil")
     elseif(IS_NETBSD)
-        set(ADDTIONAL_LIBRARIES "-lutil")
+        set(ADDITIONAL_LIBRARIES "-lutil")
     elseif(UNIX AND NOT APPLE)
         set(ADDITIONAL_LIBRARIES "-ldl -lutil")
     endif()

CodeLite/CTags.cpp

@@ -31,7 +31,7 @@ void WrapInShell(wxString& cmd)
     cmd = command;
 #else
     command << "/bin/sh -c '";
-    // escape any single quoutes
+    // escape any single quotes
     cmd.Replace("'", "\\'");
     command << cmd << "'";
     cmd = command;

CodeLite/Console/clConsoleBase.h

@@ -89,7 +89,7 @@ class WXDLLIMPEXP_CL clConsoleBase
     virtual wxString PrepareCommand() = 0;
 
     /**
-     * @brief return the best terminal for the OS. Pass an empty string to return the default temrinal for the OS
+     * @brief return the best terminal for the OS. Pass an empty string to return the default terminal for the OS
      */
     static clConsoleBase::Ptr_t GetTerminal();
 

CodeLite/Cxx/CxxCodeCompletion.cpp

@@ -127,7 +127,7 @@ TagEntryPtr CxxCodeCompletion::resolve_compound_expression(std::vector<CxxExpres
         // return a dummy entry representing the global scope
         return create_global_scope_tag();
     } else if(expression.size() >= 2 && expression[0].type_name().empty() && expression[0].operand_string() == "::") {
-        // explicity requesting for the global namespace
+        // explicitly requesting for the global namespace
         // clear the `scopes` and use only the global namespace (empty string)
         scopes.clear();
         scopes.push_back(wxEmptyString);
@@ -174,7 +174,7 @@ void CxxCodeCompletion::shrink_scope(const wxString& text, std::unordered_map<wx
         m_lookup->GetParameters(m_current_function_tag->GetPath(), parameters);
         m_lookup->GetLambdas(m_current_function_tag->GetPath(), all_lambdas);
 
-        // read all lambdas paramteres
+        // read all lambdas parameters
         std::unordered_map<wxString, TagEntryPtr> lambda_parameters_map;
         std::unordered_map<wxString, TagEntryPtr> function_parameters_map;
 
@@ -188,12 +188,12 @@ void CxxCodeCompletion::shrink_scope(const wxString& text, std::unordered_map<wx
                 std::vector<TagEntryPtr> lambda_parameters;
                 m_lookup->GetParameters(lambda->GetPath(), lambda_parameters);
                 for(auto param : lambda_parameters) {
-                    // if a function parameter with this name alrady exists, skip it
+                    // if a function parameter with this name already exists, skip it
                     if(function_parameters_map.count(param->GetName())) {
                         continue;
                     }
 
-                    // if we already encoutered a lambda parameter with this name, replace it
+                    // if we already encountered a lambda parameter with this name, replace it
                     if(lambda_parameters_map.count(param->GetName())) {
                         lambda_parameters_map.erase(param->GetName());
                     }
@@ -202,7 +202,7 @@ void CxxCodeCompletion::shrink_scope(const wxString& text, std::unordered_map<wx
             }
         }
 
-        // all the lambda paramters to the list of parameters
+        // all the lambda parameters to the list of parameters
         for(const auto& vt : lambda_parameters_map) {
             parameters.emplace_back(vt.second);
         }
@@ -382,7 +382,7 @@ void CxxCodeCompletion::update_template_table(TagEntryPtr resolved, CxxExpressio
         return;
     }
 
-    // simple template instantiaion line
+    // simple template instantiation line
     if(curexpr.is_template()) {
         curexpr.parse_template_placeholders(resolved->GetTemplateDefinition());
         wxStringMap_t M = curexpr.get_template_placeholders_map();
@@ -670,7 +670,7 @@ TagEntryPtr CxxCodeCompletion::resolve_expression(CxxExpression& curexp, TagEntr
 TagEntryPtr CxxCodeCompletion::on_typedef(CxxExpression& curexp, TagEntryPtr tag,
                                           const std::vector<wxString>& visible_scopes)
 {
-    // substitude the type with the typeref
+    // substitute the type with the typedef
     wxString new_expr;
     if(!resolve_user_type(tag->GetPath(), visible_scopes, &new_expr)) {
         new_expr = typedef_from_tag(tag);
@@ -1102,7 +1102,7 @@ void TemplateManager::add_placeholders(const wxStringMap_t& table, const std::ve
             // lets try and avoid pushing values that are templates
             // consider
             // template <typename _Tp> class vector : protected _Vector_base<_Tp> {..}
-            // Looking at the definitio of _Vector_base:
+            // Looking at the definition of _Vector_base:
             // template <typename _Tp> class _Vector_base {...}
             // this will cause us to push {"_Tp", "_Tp"} (where _Tp is both the key and value)
             // if the resolve will fail, it will return vt.second unmodified
@@ -1210,7 +1210,7 @@ void CxxCodeCompletion::sort_tags(const std::vector<TagEntryPtr>& tags, std::vec
         } else if(access == "public") {
             if(tag->GetName().StartsWith("_") || tag->GetName().Contains("operator")) {
                 // methods starting with _ usually are meant to be private
-                // and also, put the "operator" methdos at the bottom
+                // and also, put the "operator" methods at the bottom
                 privateTags.push_back(tag);
             } else {
                 publicTags.push_back(tag);
@@ -1385,7 +1385,7 @@ size_t CxxCodeCompletion::find_definition(const wxString& filepath, int line, co
         word_complete(filepath, line, expression, text, visible_scopes, true, candidates);
         // filter all the tags
         if(candidates.empty() || (candidates.size() == 1 && (candidates[0]->GetLine() == wxNOT_FOUND))) {
-            clDEBUG() << "Unable to complete, checking on the current lcoation" << endl;
+            clDEBUG() << "Unable to complete, checking on the current location" << endl;
             candidates.clear();
             m_lookup->GetTagsByFileAndLine(filepath, line, candidates);
             if(candidates.empty()) {

CodeLite/Cxx/CxxCodeCompletion.hpp

@@ -76,7 +76,7 @@ struct FileScope {
     }
 
     /**
-     * @brief return all function paramters that match the filter
+     * @brief return all function parameters that match the filter
      * if filter is empty, return all of the parameters
      */
     std::vector<TagEntryPtr> get_function_parameters(const wxString& filter) const

CodeLite/Cxx/CxxExpression.cpp

@@ -187,7 +187,7 @@ bool CxxExpression::handle_cxx_casting(CxxTokenizer& tokenizer, wxString* cast_t
         break;
     }
 
-    // did not find cast epxression
+    // did not find cast expression
     if(state == STATE_NORMAL) {
         tokenizer.UngetToken();
         return false;

CodeLite/Cxx/CxxExpression.hpp

@@ -15,7 +15,7 @@
 /// std::string::size_
 ///
 /// Passing the above to CxxExpression::from_expression
-/// and assuming that the it succeed, the mainder will be:
+/// and assuming that the it succeed, the remainder will be:
 /// filter -> size_
 /// operand_string -> "::"
 struct WXDLLIMPEXP_CL CxxRemainder {
@@ -73,7 +73,7 @@ class WXDLLIMPEXP_CL CxxExpression
     void parse_template_placeholders(const wxString& expr);
 
     /**
-     * @brief reutn template placeholders map
+     * @brief return template placeholders map
      */
     wxStringMap_t get_template_placeholders_map() const;
     /**

CodeLite/Cxx/CxxTokenizer.cpp

@@ -115,7 +115,7 @@ wxString CxxTokenizer::GetVisibleScope(const wxString& inputString)
                 parenthesisDepth++;
                 currentScope << "(";
                 // Handle lambda
-                // If we are enterting lamda function defenition, collect the locals
+                // If we are entering lambda function definition, collect the locals
                 // this is exactly what we in 'catch' hence the state change to SCP_STATE_IN_CATCH
                 if(GetLastToken().GetType() == ']') {
                     state = SCP_STATE_IN_CATCH;

CodeLite/Cxx/CxxTokenizer.h

@@ -17,8 +17,8 @@ class WXDLLIMPEXP_CL CxxTokenizer
     virtual ~CxxTokenizer();
 
     /**
-     * @brief get the next token from the toknizer
-     * @reutrn false when reached EOF
+     * @brief get the next token from the tokenizer
+     * @return false when reached EOF
      */
     bool NextToken(CxxLexerToken& token);
 

CodeLite/JSON.h

@@ -107,7 +107,7 @@ class WXDLLIMPEXP_CL JSONItem
     std::vector<int> toIntArray(const std::vector<int>& defaultValue = {}) const;
     JSONItem arrayItem(int pos) const;
 
-    // Retuen the object type
+    // Return the object type
     bool isNull() const;
     bool isBool() const;
     bool isString() const;
@@ -152,12 +152,12 @@ class WXDLLIMPEXP_CL JSONItem
     static JSONItem createArray(const wxString& name = wxT(""));
 
     /**
-     * @brief add array to this json and return a referece to the newly added array
+     * @brief add array to this json and return a reference to the newly added array
      */
     JSONItem AddArray(const wxString& name);
 
     /**
-     * @brief add object to this json and return a referece to the newly added object
+     * @brief add object to this json and return a reference to the newly added object
      */
     JSONItem AddObject(const wxString& name);
 

CodeLite/LSP/GotoDeclarationRequest.cpp

@@ -43,7 +43,7 @@ void LSP::GotoDeclarationRequest::OnResponse(const LSP::ResponseMessage& respons
             event.SetFileName(m_filename);
             EventNotifier::Get()->AddPendingEvent(event);
         } else {
-            // We send the same event for declaraion as we do for definition
+            // We send the same event for declaration as we do for definition
             LSPEvent event{ wxEVT_LSP_DEFINITION };
             event.SetLocation(loc);
             event.SetFileName(m_filename);

CodeLite/LSP/GotoImplementationRequest.cpp

@@ -25,7 +25,7 @@ void LSP::GotoImplementationRequest::OnResponse(const LSP::ResponseMessage& resp
         loc.FromJSON(result);
     }
 
-    // We send the same event for declaraion as we do for definition
+    // We send the same event for declaration as we do for definition
     if(!loc.GetPath().IsEmpty()) {
         LSPEvent definitionEvent(wxEVT_LSP_DEFINITION);
         definitionEvent.SetLocation(loc);

CodeLite/LSP/Request.h

@@ -26,7 +26,7 @@ class WXDLLIMPEXP_CL Request : public LSP::MessageWithParams
     virtual void FromJSON(const JSONItem& json);
 
     /**
-     * @brief is this request position dependant? (i.e. the response should be diplsayed where the request was
+     * @brief is this request position dependant? (i.e. the response should be displayed where the request was
      * triggered?)
      */
     virtual bool IsPositionDependantRequest() const { return false; }

CodeLite/LSP/basic_types.h

@@ -669,7 +669,7 @@ WXDLLIMPEXP_CL wxString FileNameToURI(const wxString& filename);
 /// Return the log handle of this library
 WXDLLIMPEXP_CL clModuleLogger& GetLogHandle();
 
-/// Parse the text edit from a reponse "result" field
+/// Parse the text edit from a response "result" field
 WXDLLIMPEXP_CL std::unordered_map<wxString, std::vector<LSP::TextEdit>> ParseWorkspaceEdit(const JSONItem& result);
 
 };     // namespace LSP

CodeLite/PHP/PHPDocVisitor.cpp

@@ -88,7 +88,7 @@ void PHPDocVisitor::OnEntity(PHPEntityBase::Ptr_t entity)
             wxString typeHint = docComment.GetParam(entity->GetFullName());
             const wxString& currentTypeHint = entity->Cast<PHPEntityVariable>()->GetTypeHint();
             if(!typeHint.IsEmpty() && currentTypeHint.IsEmpty()) {
-                // The typehint of a functin argument should have more value than the one provided
+                // The typehint of a function argument should have more value than the one provided
                 // in the documentation
                 entity->Cast<PHPEntityVariable>()->SetTypeHint(typeHint);
             }

CodeLite/PHP/PHPEntityClass.h

@@ -51,7 +51,7 @@ class WXDLLIMPEXP_CL PHPEntityClass : public PHPEntityBase
     JSONItem ToJSON() const;
 
     /**
-     * @brief return an array of inheritance (extends, implementes and traits)
+     * @brief return an array of inheritance (extends, implements and traits)
      */
     wxArrayString GetInheritanceArray() const;
 

CodeLite/PHP/PHPEntityNamespace.cpp

@@ -137,6 +137,6 @@ void PHPEntityNamespace::FromJSON(const JSONItem& json)
 
 JSONItem PHPEntityNamespace::ToJSON() const
 {
-    JSONItem json = BaseToJSON("n"); // n stands for namesapce
+    JSONItem json = BaseToJSON("n"); // n stands for namespace
     return json;
 }

CodeLite/PHP/PHPEntityVisitor.h

@@ -31,7 +31,7 @@
 
 /**
  * @class PHPEntityVisitor
- * Accept as input a PHPEntitBase and visit all of its children
+ * Accept as input a PHPEntityBase and visit all of its children
  */
 class WXDLLIMPEXP_CL PHPEntityVisitor
 {
@@ -42,7 +42,7 @@ class WXDLLIMPEXP_CL PHPEntityVisitor
     void Visit(PHPEntityBase::Ptr_t parent);
 
     /**
-     * @brief called whenver an entity is visited
+     * @brief called whenever an entity is visited
      * @param entity
      */
     virtual void OnEntity(PHPEntityBase::Ptr_t entity) = 0;

CodeLite/PHP/PHPExpression.cpp

@@ -276,7 +276,7 @@ PHPEntityBase::Ptr_t PHPExpression::Resolve(PHPLookupTable& lookpTable, const wx
 
         // If the current "part" of the expression ends with a scope resolving operator ("::") or
         // an object operator ("->") we need to resolve the operator to the actual type (
-        // incase of a functin it will be the return value, and in case of a variable it will be
+        // incase of a function it will be the return value, and in case of a variable it will be
         // the type hint)
         if(currentToken) {
             if(part.m_operator == kPHP_T_OBJECT_OPERATOR || part.m_operator == kPHP_T_PAAMAYIM_NEKUDOTAYIM) {
@@ -381,7 +381,7 @@ wxString PHPExpression::DoSimplifyExpression(int depth, PHPSourceFile::Ptr_t sou
                 // $this->getQuery()->fetchAll()->
                 // However, $this also need a replacement so eventually, it becomes like this:
                 // \MyClass->getQuery->fetchAll-> and this is something that we can evaluate easily using
-                // our lookup tables (note that the parenthessis are missing on purpose)
+                // our lookup tables (note that the parenthesis are missing on purpose)
                 PHPEntityBase::Ptr_t local = scope->FindChild(token.Text());
                 if(local && local->Cast<PHPEntityVariable>()) {
                     if(!local->Cast<PHPEntityVariable>()->GetTypeHint().IsEmpty()) {
@@ -448,15 +448,15 @@ wxString PHPExpression::DoSimplifyExpression(int depth, PHPSourceFile::Ptr_t sou
             if(!currentText.IsEmpty() && part.m_text.IsEmpty()) {
                 if(m_parts.empty() && token.type == kPHP_T_PAAMAYIM_NEKUDOTAYIM) {
                     // The first token in the "parts" list has a scope resolving operator ("::")
-                    // we need to make sure that the indetifier is provided in fullpath
+                    // we need to make sure that the identifier is provided in fullpath
                     part.m_text = sourceFile->MakeIdentifierAbsolute(currentText);
                 } else {
                     part.m_text = currentText;
                 }
             }
 
             if(m_parts.empty()) {
-                // If the first token before the simplication was 'parent'
+                // If the first token before the simplification was 'parent'
                 // keyword, we need to carry this over
                 part.m_textType = firstTokenType;
             }

CodeLite/PHP/PHPExpression.h

@@ -89,13 +89,13 @@ class WXDLLIMPEXP_CL PHPExpression
 
     const phpLexerToken::Vet_t& GetExpression() const { return m_expression; }
     /**
-     * @brief return the parse expression as string. Useful for debuggin purposes
+     * @brief return the parse expression as string. Useful for debugging purposes
      */
     wxString GetExpressionAsString() const;
 
     /**
      * @brief suggest matches for this expression.
-     * This function must be called after a successfull call to 'Resolve'
+     * This function must be called after a successful call to 'Resolve'
      * @param resolved the resolved object from the previous call to 'Resolve'
      * @param matches [output]
      */
@@ -130,7 +130,7 @@ class WXDLLIMPEXP_CL PHPExpression
     const wxString& GetFilter() const { return m_filter; }
 
     /**
-     * @brief get the lookup flags to pass to the lookup table for feteching members
+     * @brief get the lookup flags to pass to the lookup table for fetching members
      */
     size_t GetLookupFlags() const;
 };