Use nameof() instead of hardcoded strings for INPC

christophwille · christophwille · commit ed0bd1490594 · 2025-12-04T13:58:10.000+01:00
diff --git a/ICSharpCode.AvalonEdit/TextEditorOptions.cs b/ICSharpCode.AvalonEdit/TextEditorOptions.cs
@@ -47,8 +47,9 @@ public TextEditorOptions(TextEditorOptions options)
 
 			// copy each value over to 'this'
 			foreach (FieldInfo fi in fields) {
-				if (fi.GetCustomAttribute<NonSerializedAttribute>() == null)
+				if (fi.GetCustomAttribute<NonSerializedAttribute>() == null) {
 					fi.SetValue(this, fi.GetValue(options));
+				}
 			}
 		}
 		#endregion
@@ -91,7 +92,7 @@ public virtual bool ShowSpaces {
 			set {
 				if (showSpaces != value) {
 					showSpaces = value;
-					OnPropertyChanged("ShowSpaces");
+					OnPropertyChanged(nameof(ShowSpaces));
 				}
 			}
 		}
@@ -108,7 +109,7 @@ public virtual bool ShowTabs {
 			set {
 				if (showTabs != value) {
 					showTabs = value;
-					OnPropertyChanged("ShowTabs");
+					OnPropertyChanged(nameof(ShowTabs));
 				}
 			}
 		}
@@ -125,7 +126,7 @@ public virtual bool ShowEndOfLine {
 			set {
 				if (showEndOfLine != value) {
 					showEndOfLine = value;
-					OnPropertyChanged("ShowEndOfLine");
+					OnPropertyChanged(nameof(ShowEndOfLine));
 				}
 			}
 		}
@@ -142,7 +143,7 @@ public virtual bool ShowBoxForControlCharacters {
 			set {
 				if (showBoxForControlCharacters != value) {
 					showBoxForControlCharacters = value;
-					OnPropertyChanged("ShowBoxForControlCharacters");
+					OnPropertyChanged(nameof(ShowBoxForControlCharacters));
 				}
 			}
 		}
@@ -161,7 +162,7 @@ public virtual bool EnableHyperlinks {
 			set {
 				if (enableHyperlinks != value) {
 					enableHyperlinks = value;
-					OnPropertyChanged("EnableHyperlinks");
+					OnPropertyChanged(nameof(EnableHyperlinks));
 				}
 			}
 		}
@@ -196,7 +197,7 @@ public virtual bool RequireControlModifierForHyperlinkClick {
 			set {
 				if (requireControlModifierForHyperlinkClick != value) {
 					requireControlModifierForHyperlinkClick = value;
-					OnPropertyChanged("RequireControlModifierForHyperlinkClick");
+					OnPropertyChanged(nameof(RequireControlModifierForHyperlinkClick));
 				}
 			}
 		}
@@ -219,15 +220,15 @@ public virtual int IndentationSize {
 			get { return indentationSize; }
 			set {
 				if (value < 1)
-					throw new ArgumentOutOfRangeException("value", value, "value must be positive");
+					throw new ArgumentOutOfRangeException(nameof(value), value, "value must be positive");
 				// sanity check; a too large value might cause WPF to crash internally much later
 				// (it only crashed in the hundred thousands for me; but might crash earlier with larger fonts)
 				if (value > 1000)
-					throw new ArgumentOutOfRangeException("value", value, "indentation size is too large");
+					throw new ArgumentOutOfRangeException(nameof(value), value, "indentation size is too large");
 				if (indentationSize != value) {
 					indentationSize = value;
-					OnPropertyChanged("IndentationSize");
-					OnPropertyChanged("IndentationString");
+					OnPropertyChanged(nameof(IndentationSize));
+					OnPropertyChanged(nameof(IndentationString));
 				}
 			}
 		}
@@ -244,8 +245,8 @@ public virtual bool ConvertTabsToSpaces {
 			set {
 				if (convertTabsToSpaces != value) {
 					convertTabsToSpaces = value;
-					OnPropertyChanged("ConvertTabsToSpaces");
-					OnPropertyChanged("IndentationString");
+					OnPropertyChanged(nameof(ConvertTabsToSpaces));
+					OnPropertyChanged(nameof(IndentationString));
 				}
 			}
 		}
@@ -265,7 +266,7 @@ public string IndentationString {
 		public virtual string GetIndentationString(int column)
 		{
 			if (column < 1)
-				throw new ArgumentOutOfRangeException("column", column, "Value must be at least 1.");
+				throw new ArgumentOutOfRangeException(nameof(column), column, "Value must be at least 1.");
 			int indentationSize = this.IndentationSize;
 			if (ConvertTabsToSpaces) {
 				return new string(' ', indentationSize - ((column - 1) % indentationSize));
@@ -286,7 +287,7 @@ public virtual bool CutCopyWholeLine {
 			set {
 				if (cutCopyWholeLine != value) {
 					cutCopyWholeLine = value;
-					OnPropertyChanged("CutCopyWholeLine");
+					OnPropertyChanged(nameof(CutCopyWholeLine));
 				}
 			}
 		}
@@ -303,7 +304,7 @@ public virtual bool AllowScrollBelowDocument {
 			set {
 				if (allowScrollBelowDocument != value) {
 					allowScrollBelowDocument = value;
-					OnPropertyChanged("AllowScrollBelowDocument");
+					OnPropertyChanged(nameof(AllowScrollBelowDocument));
 				}
 			}
 		}
@@ -319,10 +320,10 @@ public virtual double WordWrapIndentation {
 			get { return wordWrapIndentation; }
 			set {
 				if (double.IsNaN(value) || double.IsInfinity(value))
-					throw new ArgumentOutOfRangeException("value", value, "value must not be NaN/infinity");
+					throw new ArgumentOutOfRangeException(nameof(value), value, "value must not be NaN/infinity");
 				if (value != wordWrapIndentation) {
 					wordWrapIndentation = value;
-					OnPropertyChanged("WordWrapIndentation");
+					OnPropertyChanged(nameof(WordWrapIndentation));
 				}
 			}
 		}
@@ -340,7 +341,7 @@ public virtual bool InheritWordWrapIndentation {
 			set {
 				if (value != inheritWordWrapIndentation) {
 					inheritWordWrapIndentation = value;
-					OnPropertyChanged("InheritWordWrapIndentation");
+					OnPropertyChanged(nameof(InheritWordWrapIndentation));
 				}
 			}
 		}
@@ -356,7 +357,7 @@ public bool EnableRectangularSelection {
 			set {
 				if (enableRectangularSelection != value) {
 					enableRectangularSelection = value;
-					OnPropertyChanged("EnableRectangularSelection");
+					OnPropertyChanged(nameof(EnableRectangularSelection));
 				}
 			}
 		}
@@ -372,7 +373,7 @@ public bool EnableTextDragDrop {
 			set {
 				if (enableTextDragDrop != value) {
 					enableTextDragDrop = value;
-					OnPropertyChanged("EnableTextDragDrop");
+					OnPropertyChanged(nameof(EnableTextDragDrop));
 				}
 			}
 		}
@@ -391,7 +392,7 @@ public virtual bool EnableVirtualSpace {
 			set {
 				if (enableVirtualSpace != value) {
 					enableVirtualSpace = value;
-				 OnPropertyChanged("EnableVirtualSpace");
+					OnPropertyChanged(nameof(EnableVirtualSpace));
 				}
 			}
 		}
@@ -408,7 +409,7 @@ public virtual bool EnableImeSupport {
 			set {
 				if (enableImeSupport != value) {
 					enableImeSupport = value;
-					OnPropertyChanged("EnableImeSupport");
+					OnPropertyChanged(nameof(EnableImeSupport));
 				}
 			}
 		}
@@ -424,7 +425,7 @@ public virtual bool ShowColumnRuler {
 			set {
 				if (showColumnRuler != value) {
 					showColumnRuler = value;
-					OnPropertyChanged("ShowColumnRuler");
+					OnPropertyChanged(nameof(ShowColumnRuler));
 				}
 			}
 		}
@@ -440,7 +441,7 @@ public virtual int ColumnRulerPosition {
 			set {
 				if (columnRulerPosition != value) {
 					columnRulerPosition = value;
-					OnPropertyChanged("ColumnRulerPosition");
+					OnPropertyChanged(nameof(ColumnRulerPosition));
 				}
 			}
 		}
@@ -456,7 +457,7 @@ public virtual bool HighlightCurrentLine {
 			set {
 				if (highlightCurrentLine != value) {
 					highlightCurrentLine = value;
-					OnPropertyChanged("HighlightCurrentLine");
+					OnPropertyChanged(nameof(HighlightCurrentLine));
 				}
 			}
 		}
@@ -472,7 +473,7 @@ public bool HideCursorWhileTyping {
 			set {
 				if (hideCursorWhileTyping != value) {
 					hideCursorWhileTyping = value;
-					OnPropertyChanged("HideCursorWhileTyping");
+					OnPropertyChanged(nameof(HideCursorWhileTyping));
 				}
 			}
 		}
@@ -488,7 +489,7 @@ public bool AllowToggleOverstrikeMode {
 			set {
 				if (allowToggleOverstrikeMode != value) {
 					allowToggleOverstrikeMode = value;
-					OnPropertyChanged("AllowToggleOverstrikeMode");
+					OnPropertyChanged(nameof(AllowToggleOverstrikeMode));
 				}
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,9 @@ public TextEditorOptions(TextEditorOptions options)`
`47`	`47`
`48`	`48`	`// copy each value over to 'this'`
`49`	`49`	`foreach (FieldInfo fi in fields) {`
`50`		`- if (fi.GetCustomAttribute<NonSerializedAttribute>() == null)`
	`50`	`+ if (fi.GetCustomAttribute<NonSerializedAttribute>() == null) {`
`51`	`51`	`fi.SetValue(this, fi.GetValue(options));`
	`52`	`+ }`
`52`	`53`	`}`
`53`	`54`	`}`
`54`	`55`	`#endregion`
`@@ -91,7 +92,7 @@ public virtual bool ShowSpaces {`
`91`	`92`	`set {`
`92`	`93`	`if (showSpaces != value) {`
`93`	`94`	`showSpaces = value;`
`94`		`- OnPropertyChanged("ShowSpaces");`
	`95`	`+ OnPropertyChanged(nameof(ShowSpaces));`
`95`	`96`	`}`
`96`	`97`	`}`
`97`	`98`	`}`
`@@ -108,7 +109,7 @@ public virtual bool ShowTabs {`
`108`	`109`	`set {`
`109`	`110`	`if (showTabs != value) {`
`110`	`111`	`showTabs = value;`
`111`		`- OnPropertyChanged("ShowTabs");`
	`112`	`+ OnPropertyChanged(nameof(ShowTabs));`
`112`	`113`	`}`
`113`	`114`	`}`
`114`	`115`	`}`
`@@ -125,7 +126,7 @@ public virtual bool ShowEndOfLine {`
`125`	`126`	`set {`
`126`	`127`	`if (showEndOfLine != value) {`
`127`	`128`	`showEndOfLine = value;`
`128`		`- OnPropertyChanged("ShowEndOfLine");`
	`129`	`+ OnPropertyChanged(nameof(ShowEndOfLine));`
`129`	`130`	`}`
`130`	`131`	`}`
`131`	`132`	`}`
`@@ -142,7 +143,7 @@ public virtual bool ShowBoxForControlCharacters {`
`142`	`143`	`set {`
`143`	`144`	`if (showBoxForControlCharacters != value) {`
`144`	`145`	`showBoxForControlCharacters = value;`
`145`		`- OnPropertyChanged("ShowBoxForControlCharacters");`
	`146`	`+ OnPropertyChanged(nameof(ShowBoxForControlCharacters));`
`146`	`147`	`}`
`147`	`148`	`}`
`148`	`149`	`}`
`@@ -161,7 +162,7 @@ public virtual bool EnableHyperlinks {`
`161`	`162`	`set {`
`162`	`163`	`if (enableHyperlinks != value) {`
`163`	`164`	`enableHyperlinks = value;`
`164`		`- OnPropertyChanged("EnableHyperlinks");`
	`165`	`+ OnPropertyChanged(nameof(EnableHyperlinks));`
`165`	`166`	`}`
`166`	`167`	`}`
`167`	`168`	`}`
`@@ -196,7 +197,7 @@ public virtual bool RequireControlModifierForHyperlinkClick {`
`196`	`197`	`set {`
`197`	`198`	`if (requireControlModifierForHyperlinkClick != value) {`
`198`	`199`	`requireControlModifierForHyperlinkClick = value;`
`199`		`- OnPropertyChanged("RequireControlModifierForHyperlinkClick");`
	`200`	`+ OnPropertyChanged(nameof(RequireControlModifierForHyperlinkClick));`
`200`	`201`	`}`
`201`	`202`	`}`
`202`	`203`	`}`
`@@ -219,15 +220,15 @@ public virtual int IndentationSize {`
`219`	`220`	`get { return indentationSize; }`
`220`	`221`	`set {`
`221`	`222`	`if (value < 1)`
`222`		`- throw new ArgumentOutOfRangeException("value", value, "value must be positive");`
	`223`	`+ throw new ArgumentOutOfRangeException(nameof(value), value, "value must be positive");`
`223`	`224`	`// sanity check; a too large value might cause WPF to crash internally much later`
`224`	`225`	`// (it only crashed in the hundred thousands for me; but might crash earlier with larger fonts)`
`225`	`226`	`if (value > 1000)`
`226`		`- throw new ArgumentOutOfRangeException("value", value, "indentation size is too large");`
	`227`	`+ throw new ArgumentOutOfRangeException(nameof(value), value, "indentation size is too large");`
`227`	`228`	`if (indentationSize != value) {`
`228`	`229`	`indentationSize = value;`
`229`		`- OnPropertyChanged("IndentationSize");`
`230`		`- OnPropertyChanged("IndentationString");`
	`230`	`+ OnPropertyChanged(nameof(IndentationSize));`
	`231`	`+ OnPropertyChanged(nameof(IndentationString));`
`231`	`232`	`}`
`232`	`233`	`}`
`233`	`234`	`}`
`@@ -244,8 +245,8 @@ public virtual bool ConvertTabsToSpaces {`
`244`	`245`	`set {`
`245`	`246`	`if (convertTabsToSpaces != value) {`
`246`	`247`	`convertTabsToSpaces = value;`
`247`		`- OnPropertyChanged("ConvertTabsToSpaces");`
`248`		`- OnPropertyChanged("IndentationString");`
	`248`	`+ OnPropertyChanged(nameof(ConvertTabsToSpaces));`
	`249`	`+ OnPropertyChanged(nameof(IndentationString));`
`249`	`250`	`}`
`250`	`251`	`}`
`251`	`252`	`}`
`@@ -265,7 +266,7 @@ public string IndentationString {`
`265`	`266`	`public virtual string GetIndentationString(int column)`
`266`	`267`	`{`
`267`	`268`	`if (column < 1)`
`268`		`- throw new ArgumentOutOfRangeException("column", column, "Value must be at least 1.");`
	`269`	`+ throw new ArgumentOutOfRangeException(nameof(column), column, "Value must be at least 1.");`
`269`	`270`	`int indentationSize = this.IndentationSize;`
`270`	`271`	`if (ConvertTabsToSpaces) {`
`271`	`272`	`return new string(' ', indentationSize - ((column - 1) % indentationSize));`
`@@ -286,7 +287,7 @@ public virtual bool CutCopyWholeLine {`
`286`	`287`	`set {`
`287`	`288`	`if (cutCopyWholeLine != value) {`
`288`	`289`	`cutCopyWholeLine = value;`
`289`		`- OnPropertyChanged("CutCopyWholeLine");`
	`290`	`+ OnPropertyChanged(nameof(CutCopyWholeLine));`
`290`	`291`	`}`
`291`	`292`	`}`
`292`	`293`	`}`
`@@ -303,7 +304,7 @@ public virtual bool AllowScrollBelowDocument {`
`303`	`304`	`set {`
`304`	`305`	`if (allowScrollBelowDocument != value) {`
`305`	`306`	`allowScrollBelowDocument = value;`
`306`		`- OnPropertyChanged("AllowScrollBelowDocument");`
	`307`	`+ OnPropertyChanged(nameof(AllowScrollBelowDocument));`
`307`	`308`	`}`
`308`	`309`	`}`
`309`	`310`	`}`
`@@ -319,10 +320,10 @@ public virtual double WordWrapIndentation {`
`319`	`320`	`get { return wordWrapIndentation; }`
`320`	`321`	`set {`
`321`	`322`	`if (double.IsNaN(value) \|\| double.IsInfinity(value))`
`322`		`- throw new ArgumentOutOfRangeException("value", value, "value must not be NaN/infinity");`
	`323`	`+ throw new ArgumentOutOfRangeException(nameof(value), value, "value must not be NaN/infinity");`
`323`	`324`	`if (value != wordWrapIndentation) {`
`324`	`325`	`wordWrapIndentation = value;`
`325`		`- OnPropertyChanged("WordWrapIndentation");`
	`326`	`+ OnPropertyChanged(nameof(WordWrapIndentation));`
`326`	`327`	`}`
`327`	`328`	`}`
`328`	`329`	`}`
`@@ -340,7 +341,7 @@ public virtual bool InheritWordWrapIndentation {`
`340`	`341`	`set {`
`341`	`342`	`if (value != inheritWordWrapIndentation) {`
`342`	`343`	`inheritWordWrapIndentation = value;`
`343`		`- OnPropertyChanged("InheritWordWrapIndentation");`
	`344`	`+ OnPropertyChanged(nameof(InheritWordWrapIndentation));`
`344`	`345`	`}`
`345`	`346`	`}`
`346`	`347`	`}`
`@@ -356,7 +357,7 @@ public bool EnableRectangularSelection {`
`356`	`357`	`set {`
`357`	`358`	`if (enableRectangularSelection != value) {`
`358`	`359`	`enableRectangularSelection = value;`
`359`		`- OnPropertyChanged("EnableRectangularSelection");`
	`360`	`+ OnPropertyChanged(nameof(EnableRectangularSelection));`
`360`	`361`	`}`
`361`	`362`	`}`
`362`	`363`	`}`
`@@ -372,7 +373,7 @@ public bool EnableTextDragDrop {`
`372`	`373`	`set {`
`373`	`374`	`if (enableTextDragDrop != value) {`
`374`	`375`	`enableTextDragDrop = value;`
`375`		`- OnPropertyChanged("EnableTextDragDrop");`
	`376`	`+ OnPropertyChanged(nameof(EnableTextDragDrop));`
`376`	`377`	`}`
`377`	`378`	`}`
`378`	`379`	`}`
`@@ -391,7 +392,7 @@ public virtual bool EnableVirtualSpace {`
`391`	`392`	`set {`
`392`	`393`	`if (enableVirtualSpace != value) {`
`393`	`394`	`enableVirtualSpace = value;`
`394`		`- OnPropertyChanged("EnableVirtualSpace");`
	`395`	`+ OnPropertyChanged(nameof(EnableVirtualSpace));`
`395`	`396`	`}`
`396`	`397`	`}`
`397`	`398`	`}`
`@@ -408,7 +409,7 @@ public virtual bool EnableImeSupport {`
`408`	`409`	`set {`
`409`	`410`	`if (enableImeSupport != value) {`
`410`	`411`	`enableImeSupport = value;`
`411`		`- OnPropertyChanged("EnableImeSupport");`
	`412`	`+ OnPropertyChanged(nameof(EnableImeSupport));`
`412`	`413`	`}`
`413`	`414`	`}`
`414`	`415`	`}`
`@@ -424,7 +425,7 @@ public virtual bool ShowColumnRuler {`
`424`	`425`	`set {`
`425`	`426`	`if (showColumnRuler != value) {`
`426`	`427`	`showColumnRuler = value;`
`427`		`- OnPropertyChanged("ShowColumnRuler");`
	`428`	`+ OnPropertyChanged(nameof(ShowColumnRuler));`
`428`	`429`	`}`
`429`	`430`	`}`
`430`	`431`	`}`
`@@ -440,7 +441,7 @@ public virtual int ColumnRulerPosition {`
`440`	`441`	`set {`
`441`	`442`	`if (columnRulerPosition != value) {`
`442`	`443`	`columnRulerPosition = value;`
`443`		`- OnPropertyChanged("ColumnRulerPosition");`
	`444`	`+ OnPropertyChanged(nameof(ColumnRulerPosition));`
`444`	`445`	`}`
`445`	`446`	`}`
`446`	`447`	`}`
`@@ -456,7 +457,7 @@ public virtual bool HighlightCurrentLine {`
`456`	`457`	`set {`
`457`	`458`	`if (highlightCurrentLine != value) {`
`458`	`459`	`highlightCurrentLine = value;`
`459`		`- OnPropertyChanged("HighlightCurrentLine");`
	`460`	`+ OnPropertyChanged(nameof(HighlightCurrentLine));`
`460`	`461`	`}`
`461`	`462`	`}`
`462`	`463`	`}`
`@@ -472,7 +473,7 @@ public bool HideCursorWhileTyping {`
`472`	`473`	`set {`
`473`	`474`	`if (hideCursorWhileTyping != value) {`
`474`	`475`	`hideCursorWhileTyping = value;`
`475`		`- OnPropertyChanged("HideCursorWhileTyping");`
	`476`	`+ OnPropertyChanged(nameof(HideCursorWhileTyping));`
`476`	`477`	`}`
`477`	`478`	`}`
`478`	`479`	`}`
`@@ -488,7 +489,7 @@ public bool AllowToggleOverstrikeMode {`
`488`	`489`	`set {`
`489`	`490`	`if (allowToggleOverstrikeMode != value) {`
`490`	`491`	`allowToggleOverstrikeMode = value;`
`491`		`- OnPropertyChanged("AllowToggleOverstrikeMode");`
	`492`	`+ OnPropertyChanged(nameof(AllowToggleOverstrikeMode));`
`492`	`493`	`}`
`493`	`494`	`}`
`494`	`495`	`}`