Skip to content

Commit 7255abf

Browse files
committed
[cleanup] Fix some English typo
1 parent 8586f3b commit 7255abf

File tree

99 files changed

+872
-872
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+872
-872
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -879,7 +879,7 @@ endif()
879879
# add the dtl module include path before we include Plugin folder
880880
include_directories(submodules/dtl)
881881
882-
# Extran lexers required by CodeLite
882+
# Extra lexers required by CodeLite
883883
add_subdirectory(submodules/lexilla)
884884
885885
add_subdirectory(submodules)

CodeFormatter/PHPFormatterBuffer.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ PHPFormatterBuffer& PHPFormatterBuffer::ProcessToken(const phpLexerToken& token)
210210
m_buffer << token.Text();
211211

212212
} else if(token.type == '!') {
213-
// dont add extrace space after the NOT operator
213+
// dont add extra space after the NOT operator
214214
m_buffer << token.Text();
215215

216216
} else if(token.type == kPHP_T_NS_SEPARATOR) {
@@ -293,7 +293,7 @@ wxString PHPFormatterBuffer::FormatDoxyComment(const wxString& comment)
293293
for(size_t i = 0; i < lines.GetCount(); ++i) {
294294
lines.Item(i).Trim().Trim(false);
295295
if(i) {
296-
// preprend space + the indent string for every line except for the first line
296+
// prepend space + the indent string for every line except for the first line
297297
lines.Item(i).Prepend(" ");
298298
lines.Item(i).Prepend(indent);
299299
}
@@ -351,7 +351,7 @@ void PHPFormatterBuffer::format()
351351
// if(..) <statement> -> if(..)
352352
// <statement>
353353
// etc.
354-
// In addtion, we also handle here the following:
354+
// In addition, we also handle here the following:
355355
// if(something) {} else <statement> =>
356356
// if(something) {
357357
// } else

CodeLite/AsyncProcess/TerminalEmulator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ bool TerminalEmulator::ExecuteNoConsole(const wxString& commandToRun, const wxSt
134134
#else
135135
wxString tmpCmd = commandToRun;
136136
command << "/bin/bash -c '";
137-
// escape any single quoutes
137+
// escape any single quotes
138138
tmpCmd.Replace("'", "\\'");
139139
command << tmpCmd << "'";
140140
#endif

CodeLite/AsyncProcess/asyncprocess.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ class WXDLLIMPEXP_CL IProcess : public wxEvtHandler
148148
virtual void Cleanup() = 0;
149149

150150
// Terminate the process. It is recommended to use this method
151-
// so it will invoke the 'Cleaup' procedure and the process
151+
// so it will invoke the 'Cleanup' procedure and the process
152152
// termination event will be sent out
153153
virtual void Terminate() = 0;
154154

CodeLite/AsyncProcess/winprocess_impl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class WXDLLIMPEXP_CL WinProcessImpl : public IProcess
7575
/**
7676
* @brief read data from stdout and error
7777
* @param buff check the buffer when true is returned
78-
* @return return true on success or timeout, flase otherwise, incase of false the reader thread will terminate
78+
* @return return true on success or timeout, false otherwise, incase of false the reader thread will terminate
7979
*/
8080
bool Read(wxString& buff, wxString& buffErr, std::string& raw_buff, std::string& raw_buff_err) override;
8181

CodeLite/CTags.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ void WrapInShell(wxString& cmd)
3131
cmd = command;
3232
#else
3333
command << "/bin/sh -c '";
34-
// escape any single quoutes
34+
// escape any single quotes
3535
cmd.Replace("'", "\\'");
3636
command << cmd << "'";
3737
cmd = command;

CodeLite/Console/clConsoleBase.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class WXDLLIMPEXP_CL clConsoleBase
8989
virtual wxString PrepareCommand() = 0;
9090

9191
/**
92-
* @brief return the best terminal for the OS. Pass an empty string to return the default temrinal for the OS
92+
* @brief return the best terminal for the OS. Pass an empty string to return the default terminal for the OS
9393
*/
9494
static clConsoleBase::Ptr_t GetTerminal();
9595

CodeLite/Cxx/CxxCodeCompletion.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ TagEntryPtr CxxCodeCompletion::resolve_compound_expression(std::vector<CxxExpres
127127
// return a dummy entry representing the global scope
128128
return create_global_scope_tag();
129129
} else if(expression.size() >= 2 && expression[0].type_name().empty() && expression[0].operand_string() == "::") {
130-
// explicity requesting for the global namespace
130+
// explicitly requesting for the global namespace
131131
// clear the `scopes` and use only the global namespace (empty string)
132132
scopes.clear();
133133
scopes.push_back(wxEmptyString);
@@ -174,7 +174,7 @@ void CxxCodeCompletion::shrink_scope(const wxString& text, std::unordered_map<wx
174174
m_lookup->GetParameters(m_current_function_tag->GetPath(), parameters);
175175
m_lookup->GetLambdas(m_current_function_tag->GetPath(), all_lambdas);
176176

177-
// read all lambdas paramteres
177+
// read all lambdas parameters
178178
std::unordered_map<wxString, TagEntryPtr> lambda_parameters_map;
179179
std::unordered_map<wxString, TagEntryPtr> function_parameters_map;
180180

@@ -188,12 +188,12 @@ void CxxCodeCompletion::shrink_scope(const wxString& text, std::unordered_map<wx
188188
std::vector<TagEntryPtr> lambda_parameters;
189189
m_lookup->GetParameters(lambda->GetPath(), lambda_parameters);
190190
for(auto param : lambda_parameters) {
191-
// if a function parameter with this name alrady exists, skip it
191+
// if a function parameter with this name already exists, skip it
192192
if(function_parameters_map.count(param->GetName())) {
193193
continue;
194194
}
195195

196-
// if we already encoutered a lambda parameter with this name, replace it
196+
// if we already encountered a lambda parameter with this name, replace it
197197
if(lambda_parameters_map.count(param->GetName())) {
198198
lambda_parameters_map.erase(param->GetName());
199199
}
@@ -202,7 +202,7 @@ void CxxCodeCompletion::shrink_scope(const wxString& text, std::unordered_map<wx
202202
}
203203
}
204204

205-
// all the lambda paramters to the list of parameters
205+
// all the lambda parameters to the list of parameters
206206
for(const auto& vt : lambda_parameters_map) {
207207
parameters.emplace_back(vt.second);
208208
}
@@ -382,7 +382,7 @@ void CxxCodeCompletion::update_template_table(TagEntryPtr resolved, CxxExpressio
382382
return;
383383
}
384384

385-
// simple template instantiaion line
385+
// simple template instantiation line
386386
if(curexpr.is_template()) {
387387
curexpr.parse_template_placeholders(resolved->GetTemplateDefinition());
388388
wxStringMap_t M = curexpr.get_template_placeholders_map();
@@ -670,7 +670,7 @@ TagEntryPtr CxxCodeCompletion::resolve_expression(CxxExpression& curexp, TagEntr
670670
TagEntryPtr CxxCodeCompletion::on_typedef(CxxExpression& curexp, TagEntryPtr tag,
671671
const std::vector<wxString>& visible_scopes)
672672
{
673-
// substitude the type with the typeref
673+
// substitute the type with the typedef
674674
wxString new_expr;
675675
if(!resolve_user_type(tag->GetPath(), visible_scopes, &new_expr)) {
676676
new_expr = typedef_from_tag(tag);
@@ -1102,7 +1102,7 @@ void TemplateManager::add_placeholders(const wxStringMap_t& table, const std::ve
11021102
// lets try and avoid pushing values that are templates
11031103
// consider
11041104
// template <typename _Tp> class vector : protected _Vector_base<_Tp> {..}
1105-
// Looking at the definitio of _Vector_base:
1105+
// Looking at the definition of _Vector_base:
11061106
// template <typename _Tp> class _Vector_base {...}
11071107
// this will cause us to push {"_Tp", "_Tp"} (where _Tp is both the key and value)
11081108
// 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
12101210
} else if(access == "public") {
12111211
if(tag->GetName().StartsWith("_") || tag->GetName().Contains("operator")) {
12121212
// methods starting with _ usually are meant to be private
1213-
// and also, put the "operator" methdos at the bottom
1213+
// and also, put the "operator" methods at the bottom
12141214
privateTags.push_back(tag);
12151215
} else {
12161216
publicTags.push_back(tag);
@@ -1385,7 +1385,7 @@ size_t CxxCodeCompletion::find_definition(const wxString& filepath, int line, co
13851385
word_complete(filepath, line, expression, text, visible_scopes, true, candidates);
13861386
// filter all the tags
13871387
if(candidates.empty() || (candidates.size() == 1 && (candidates[0]->GetLine() == wxNOT_FOUND))) {
1388-
clDEBUG() << "Unable to complete, checking on the current lcoation" << endl;
1388+
clDEBUG() << "Unable to complete, checking on the current location" << endl;
13891389
candidates.clear();
13901390
m_lookup->GetTagsByFileAndLine(filepath, line, candidates);
13911391
if(candidates.empty()) {

CodeLite/Cxx/CxxCodeCompletion.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ struct FileScope {
7676
}
7777

7878
/**
79-
* @brief return all function paramters that match the filter
79+
* @brief return all function parameters that match the filter
8080
* if filter is empty, return all of the parameters
8181
*/
8282
std::vector<TagEntryPtr> get_function_parameters(const wxString& filter) const

CodeLite/Cxx/CxxExpression.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ bool CxxExpression::handle_cxx_casting(CxxTokenizer& tokenizer, wxString* cast_t
187187
break;
188188
}
189189

190-
// did not find cast epxression
190+
// did not find cast expression
191191
if(state == STATE_NORMAL) {
192192
tokenizer.UngetToken();
193193
return false;

0 commit comments

Comments
 (0)