diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Document.cxx | 12 | ||||
| -rw-r--r-- | src/Editor.cxx | 34 | 
2 files changed, 23 insertions, 23 deletions
| diff --git a/src/Document.cxx b/src/Document.cxx index d62dd64e0..068d406cf 100644 --- a/src/Document.cxx +++ b/src/Document.cxx @@ -420,7 +420,7 @@ void Document::GetHighlightDelimiters(HighlightDelimiter &highlightDelimiter, in  	int lookLine = line;  	int lookLineLevel = level;  	int lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK; -	while ((lookLine > 0) && ((lookLineLevel & SC_FOLDLEVELWHITEFLAG) ||  +	while ((lookLine > 0) && ((lookLineLevel & SC_FOLDLEVELWHITEFLAG) ||  		((lookLineLevel & SC_FOLDLEVELHEADERFLAG) && (lookLineLevelNum >= (GetLevel(lookLine + 1) & SC_FOLDLEVELNUMBERMASK))))) {  		lookLineLevel = GetLevel(--lookLine);  		lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK; @@ -453,8 +453,8 @@ void Document::GetHighlightDelimiters(HighlightDelimiter &highlightDelimiter, in  		}  	}  	if (firstChangeableLineBefore == -1) { -		for (lookLine = line - 1, lookLineLevel = GetLevel(lookLine), lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK;  -			lookLine >= beginFoldBlock;  +		for (lookLine = line - 1, lookLineLevel = GetLevel(lookLine), lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK; +			lookLine >= beginFoldBlock;  			lookLineLevel = GetLevel(--lookLine), lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK) {  			if ((lookLineLevel & SC_FOLDLEVELWHITEFLAG) || (lookLineLevelNum > (level & SC_FOLDLEVELNUMBERMASK))) {  				firstChangeableLineBefore = lookLine; @@ -466,8 +466,8 @@ void Document::GetHighlightDelimiters(HighlightDelimiter &highlightDelimiter, in  		firstChangeableLineBefore = beginFoldBlock - 1;  	int firstChangeableLineAfter = -1; -	for (lookLine = line + 1, lookLineLevel = GetLevel(lookLine), lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK;  -		lookLine <= endFoldBlock;  +	for (lookLine = line + 1, lookLineLevel = GetLevel(lookLine), lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK; +		lookLine <= endFoldBlock;  		lookLineLevel = GetLevel(++lookLine), lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK) {  		if ((lookLineLevel & SC_FOLDLEVELHEADERFLAG) && (lookLineLevelNum < (GetLevel(lookLine + 1) & SC_FOLDLEVELNUMBERMASK))) {  			firstChangeableLineAfter = lookLine; @@ -715,7 +715,7 @@ bool SCI_METHOD Document::IsDBCSLeadByte(char ch) const {  			// Shift_jis  			return ((uch >= 0x81) && (uch <= 0x9F)) ||  				((uch >= 0xE0) && (uch <= 0xFC)); -				// Lead bytes F0 to FC may be a Microsoft addition.  +				// Lead bytes F0 to FC may be a Microsoft addition.  		case 936:  			// GBK  			return (uch >= 0x81) && (uch <= 0xFE); diff --git a/src/Editor.cxx b/src/Editor.cxx index 783633c2e..8f023ee5f 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -106,7 +106,7 @@ Editor::Editor() {  	stylesValid = false;  	technology = SC_TECHNOLOGY_DEFAULT;  	scaleRGBAImage = 100; -	 +  	printMagnification = 0;  	printColourMode = SC_PRINT_NORMAL;  	printWrapState = eWrapWord; @@ -149,7 +149,7 @@ Editor::Editor() {  	caretYPolicy = CARET_EVEN;  	caretYSlop = 0; -	 +  	visiblePolicy = 0;  	visibleSlop = 0; @@ -1765,7 +1765,7 @@ static int WidthStyledText(Surface *surface, ViewStyle &vs, int styleOffset,  		size_t endSegment = start;  		while ((endSegment+1 < len) && (static_cast<size_t>(styles[endSegment+1]) == style))  			endSegment++; -		width += surface->WidthText(vs.styles[style+styleOffset].font, text + start,  +		width += surface->WidthText(vs.styles[style+styleOffset].font, text + start,  			static_cast<int>(endSegment - start + 1));  		start = endSegment + 1;  	} @@ -2287,7 +2287,7 @@ void Editor::LayoutLine(int line, Surface *surface, ViewStyle &vstyle, LineLayou  				if (vstyle.styles[ll->styles[charInLine]].visible) {  					if (isControl) {  						if (ll->chars[charInLine] == '\t') { -							ll->positions[charInLine + 1] =  +							ll->positions[charInLine + 1] =  								((static_cast<int>((startsegx + 2) / tabWidth) + 1) * tabWidth) - startsegx;  						} else if (controlCharSymbol < 32) {  							if (ctrlCharWidth[ll->chars[charInLine]] == 0) { @@ -4444,7 +4444,7 @@ void Editor::DelCharBack(bool allowLineStartDeletion) {  void Editor::NotifyFocus(bool) {}  void Editor::SetCtrlID(int identifier) { -	ctrlID = identifier;  +	ctrlID = identifier;  }  void Editor::NotifyStyleToNeeded(int endStyleNeeded) { @@ -6374,7 +6374,7 @@ void Editor::ButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, b  			if (inSelMargin) {  				// Inside margin selection type should be either selSubLine or selWholeLine.  				if (selectionType == selSubLine) { -					// If it is selSubLine, we're inside a *double* click and word wrap is enabled,  +					// If it is selSubLine, we're inside a *double* click and word wrap is enabled,  					// so we switch to selWholeLine in order to select whole line.  					selectionType = selWholeLine;  				} else if (selectionType != selSubLine && selectionType != selWholeLine) { @@ -6386,7 +6386,7 @@ void Editor::ButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, b  					selectionType = selWord;  					doubleClick = true;  				} else if (selectionType == selWord) { -					// Since we ended up here, we're inside a *triple* click, which should always select  +					// Since we ended up here, we're inside a *triple* click, which should always select  					// whole line irregardless of word wrap being enabled or not.  					selectionType = selWholeLine;  				} else { @@ -6451,7 +6451,7 @@ void Editor::ButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, b  					lineAnchorPos = sel.MainAnchor() - 1;  				else  					lineAnchorPos = sel.MainAnchor(); -				// Reset selection type if there is an empty selection.  +				// Reset selection type if there is an empty selection.  				// This ensures that we don't end up stuck in previous selection mode, which is no longer valid.  				// Otherwise, if there's a non empty selection, reset selection type only if it differs from selSubLine and selWholeLine.  				// This ensures that we continue selecting in the same selection mode. @@ -7095,7 +7095,7 @@ void Editor::EnsureLineVisible(int lineDoc, bool enforcePolicy) {  		WrapLines(true, -1);  	if (!cs.GetVisible(lineDoc)) { -		// Back up to find a non-blank line  +		// Back up to find a non-blank line  		int lookLine = lineDoc;  		int lookLineLevel = pdoc->GetLevel(lookLine);  		while ((lookLine > 0) && (lookLineLevel & SC_FOLDLEVELWHITEFLAG)) { @@ -7103,7 +7103,7 @@ void Editor::EnsureLineVisible(int lineDoc, bool enforcePolicy) {  		}  		int lineParent = pdoc->GetFoldParent(lookLine);  		if (lineParent < 0) { -			// Backed up to a top level line, so try to find parent of initial line  +			// Backed up to a top level line, so try to find parent of initial line  			lineParent = pdoc->GetFoldParent(lineDoc);  		}  		if (lineParent >= 0) { @@ -8044,10 +8044,10 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {  	case SCI_GETLINEENDTYPESALLOWED:  		return pdoc->GetLineEndTypesAllowed(); -		 +  	case SCI_GETLINEENDTYPESACTIVE:  		return pdoc->GetLineEndTypesActive(); -		 +  	case SCI_STARTSTYLING:  		pdoc->StartStyling(wParam, static_cast<char>(lParam));  		break; @@ -8429,7 +8429,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {  	case SCI_MARKERGET:  		return pdoc->GetMark(wParam); -	case SCI_MARKERNEXT:  +	case SCI_MARKERNEXT:  		return pdoc->MarkerNext(wParam, lParam);  	case SCI_MARKERPREVIOUS: { @@ -8719,7 +8719,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {  		EnsureLineVisible(wParam, true);  		break; -	case SCI_SCROLLRANGE:  +	case SCI_SCROLLRANGE:  		ScrollRange(SelectionRange(lParam, wParam));  		break; @@ -9657,18 +9657,18 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {  	case SCI_CHANGELEXERSTATE:  		pdoc->ChangeLexerState(wParam, lParam);  		break; -	 +  	case SCI_SETIDENTIFIER:  		SetCtrlID(wParam);  		break; -	 +  	case SCI_GETIDENTIFIER:  		return GetCtrlID();  	case SCI_SETTECHNOLOGY:  		// No action by default  		break; -	 +  	case SCI_GETTECHNOLOGY:  		return technology; | 
