Avoid else after return for simple cases.

Author: nyamatongwe

lexlib/Accessor.cxx

@@ -72,6 +72,5 @@ int Accessor::IndentAmount(Sci_Position line, int *flags, PFNIsCommentLeader pfn
 	if ((LineStart(line) == Length()) || (ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r') ||
 			(pfnIsCommentLeader && (*pfnIsCommentLeader)(*this, pos, end-pos)))
 		return indent | SC_FOLDLEVELWHITEFLAG;
-	else
-		return indent;
+	return indent;
 }

lexlib/CharacterCategory.cxx

@@ -4285,18 +4285,16 @@ bool IsIdContinue(int character) noexcept {
 bool IsXidStart(int character) noexcept {
 	if (OmitXidStart(character)) {
 		return false;
-	} else {
-		return IsIdStart(character);
 	}
+	return IsIdStart(character);
 }
 
 // XID_Continue is ID_Continue modified for Normalization Form KC in UAX #31
 bool IsXidContinue(int character) noexcept {
 	if (OmitXidContinue(character)) {
 		return false;
-	} else {
-		return IsIdContinue(character);
 	}
+	return IsIdContinue(character);
 }
 
 CharacterCategoryMap::CharacterCategoryMap() {

lexlib/LexerBase.cxx

@@ -65,9 +65,8 @@ const char * SCI_METHOD LexerBase::DescribeProperty(const char *) {
 Sci_Position SCI_METHOD LexerBase::PropertySet(const char *key, const char *val) {
 	if (props.Set(key, val)) {
 		return 0;
-	} else {
-		return -1;
 	}
+	return -1;
 }
 
 const char *SCI_METHOD LexerBase::PropertyGet(const char *key) {

lexlib/LexerModule.cxx

@@ -63,24 +63,22 @@ int LexerModule::GetLanguage() const noexcept {
 int LexerModule::GetNumWordLists() const noexcept {
 	if (!wordListDescriptions) {
 		return -1;
-	} else {
-		int numWordLists = 0;
-
-		while (wordListDescriptions[numWordLists]) {
-			++numWordLists;
-		}
+	}
+	int numWordLists = 0;
 
-		return numWordLists;
+	while (wordListDescriptions[numWordLists]) {
+		++numWordLists;
 	}
+
+	return numWordLists;
 }
 
 const char *LexerModule::GetWordListDescription(int index) const noexcept {
 	assert(index < GetNumWordLists());
 	if (!wordListDescriptions || (index >= GetNumWordLists())) {
 		return "";
-	} else {
-		return wordListDescriptions[index];
 	}
+	return wordListDescriptions[index];
 }
 
 const LexicalClass *LexerModule::LexClasses() const noexcept {
@@ -94,8 +92,7 @@ size_t LexerModule::NamedStyles() const noexcept {
 Scintilla::ILexer5 *LexerModule::Create() const {
 	if (fnFactory)
 		return fnFactory();
-	else
-		return new LexerSimple(this);
+	return new LexerSimple(this);
 }
 
 void LexerModule::Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle,