Skip to content

Commit f40856f

Browse files
committed
Corrected typo
1 parent 8e6bd0a commit f40856f

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

NppJSONViewer/NppJsonViewer/Define.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ struct Indent
100100

101101
struct ParseOptions
102102
{
103-
bool bIgnoreComment = true;
104-
bool bIgnoreTraillingComma = true;
105-
bool bReplaceUndefined = false;
103+
bool bIgnoreComment = true;
104+
bool bIgnoreTrailingComma = true;
105+
bool bReplaceUndefined = false;
106106
};
107107

108108
struct Setting

NppJSONViewer/NppJsonViewer/JsonHandler.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,22 +56,22 @@ inline auto JsonHandler::ParseJson(const std::string &jsonText, rj::StringBuffer
5656
constexpr auto flgBase_comma = flgBase | rj::kParseTrailingCommasFlag;
5757
constexpr auto flgBase_Both = flgBase_comma | flgBase_commemt;
5858

59-
if (m_parseOptions.bIgnoreComment && m_parseOptions.bIgnoreTraillingComma)
59+
if (m_parseOptions.bIgnoreComment && m_parseOptions.bIgnoreTrailingComma)
6060
{
6161
success = reader.Parse<flgBase_Both>(ss, handler) && sb.GetString();
6262
}
6363

64-
else if (!m_parseOptions.bIgnoreComment && m_parseOptions.bIgnoreTraillingComma)
64+
else if (!m_parseOptions.bIgnoreComment && m_parseOptions.bIgnoreTrailingComma)
6565
{
6666
success = reader.Parse<flgBase_comma>(ss, handler) && sb.GetString();
6767
}
6868

69-
else if (m_parseOptions.bIgnoreComment && !m_parseOptions.bIgnoreTraillingComma)
69+
else if (m_parseOptions.bIgnoreComment && !m_parseOptions.bIgnoreTrailingComma)
7070
{
7171
success = reader.Parse<flgBase_commemt>(ss, handler) && sb.GetString();
7272
}
7373

74-
else if (!m_parseOptions.bIgnoreComment && !m_parseOptions.bIgnoreTraillingComma)
74+
else if (!m_parseOptions.bIgnoreComment && !m_parseOptions.bIgnoreTrailingComma)
7575
{
7676
success = reader.Parse<flgBase>(ss, handler) && sb.GetString();
7777
}

NppJSONViewer/NppJsonViewer/Profile.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ bool ProfileSetting::GetSettings(Setting &info) const
106106
if (bRetVal)
107107
info.parseOptions.bIgnoreComment = static_cast<bool>(nVal);
108108

109-
bRetVal &= ReadValue(STR_INI_OTHER_SEC, STR_INI_OTHER_IGNORE_COMMA, nVal, info.parseOptions.bIgnoreTraillingComma);
109+
bRetVal &= ReadValue(STR_INI_OTHER_SEC, STR_INI_OTHER_IGNORE_COMMA, nVal, info.parseOptions.bIgnoreTrailingComma);
110110
if (bRetVal)
111-
info.parseOptions.bIgnoreTraillingComma = static_cast<bool>(nVal);
111+
info.parseOptions.bIgnoreTrailingComma = static_cast<bool>(nVal);
112112

113113
bRetVal &= ReadValue(STR_INI_OTHER_SEC, STR_INI_OTHER_REPLACE_UNDEFINED, nVal, info.parseOptions.bReplaceUndefined);
114114
if (bRetVal)
@@ -130,7 +130,7 @@ bool ProfileSetting::SetSettings(const Setting &info) const
130130
bRetVal &= WriteValue(STR_INI_OTHER_SEC, STR_INI_OTHER_AUTO_FORMAT, info.bAutoFormat);
131131
bRetVal &= WriteValue(STR_INI_OTHER_SEC, STR_INI_OTHER_USE_HIGHLIGHT, info.bUseJsonHighlight);
132132
bRetVal &= WriteValue(STR_INI_OTHER_SEC, STR_INI_OTHER_IGNORE_COMMENT, info.parseOptions.bIgnoreComment);
133-
bRetVal &= WriteValue(STR_INI_OTHER_SEC, STR_INI_OTHER_IGNORE_COMMA, info.parseOptions.bIgnoreTraillingComma);
133+
bRetVal &= WriteValue(STR_INI_OTHER_SEC, STR_INI_OTHER_IGNORE_COMMA, info.parseOptions.bIgnoreTrailingComma);
134134
bRetVal &= WriteValue(STR_INI_OTHER_SEC, STR_INI_OTHER_REPLACE_UNDEFINED, info.parseOptions.bReplaceUndefined);
135135

136136
return bRetVal;

NppJSONViewer/NppJsonViewer/SettingsDlg.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,12 @@ bool SettingsDlg::Apply()
122122
else if (IsDlgButtonChecked(_hSelf, IDC_RADIO_LINEFORMAT_SINGLE))
123123
m_pSetting->lineFormat = LineFormat::SINGLELINE;
124124

125-
m_pSetting->bFollowCurrentTab = CUtility::GetCheckboxStatus(::GetDlgItem(_hSelf, IDC_CHK_FOLLOW_CURRENT_DOC));
126-
m_pSetting->bAutoFormat = CUtility::GetCheckboxStatus(::GetDlgItem(_hSelf, IDC_CHK_FORMAT_ON_OPEN));
127-
m_pSetting->bUseJsonHighlight = CUtility::GetCheckboxStatus(::GetDlgItem(_hSelf, IDC_CHK_JSON_HIGHLIGHT));
128-
m_pSetting->parseOptions.bIgnoreTraillingComma = CUtility::GetCheckboxStatus(::GetDlgItem(_hSelf, IDC_CHK_IGNORE_COMMA));
129-
m_pSetting->parseOptions.bIgnoreComment = CUtility::GetCheckboxStatus(::GetDlgItem(_hSelf, IDC_CHK_IGNORE_COMMENT));
130-
m_pSetting->parseOptions.bReplaceUndefined = CUtility::GetCheckboxStatus(::GetDlgItem(_hSelf, IDC_CHK_REPLACE_UNDEFINED));
125+
m_pSetting->bFollowCurrentTab = CUtility::GetCheckboxStatus(::GetDlgItem(_hSelf, IDC_CHK_FOLLOW_CURRENT_DOC));
126+
m_pSetting->bAutoFormat = CUtility::GetCheckboxStatus(::GetDlgItem(_hSelf, IDC_CHK_FORMAT_ON_OPEN));
127+
m_pSetting->bUseJsonHighlight = CUtility::GetCheckboxStatus(::GetDlgItem(_hSelf, IDC_CHK_JSON_HIGHLIGHT));
128+
m_pSetting->parseOptions.bIgnoreTrailingComma = CUtility::GetCheckboxStatus(::GetDlgItem(_hSelf, IDC_CHK_IGNORE_COMMA));
129+
m_pSetting->parseOptions.bIgnoreComment = CUtility::GetCheckboxStatus(::GetDlgItem(_hSelf, IDC_CHK_IGNORE_COMMENT));
130+
m_pSetting->parseOptions.bReplaceUndefined = CUtility::GetCheckboxStatus(::GetDlgItem(_hSelf, IDC_CHK_REPLACE_UNDEFINED));
131131

132132
return WriteINI();
133133
}
@@ -207,7 +207,7 @@ void SettingsDlg::InitDlg()
207207
CUtility::SetCheckboxStatus(::GetDlgItem(_hSelf, IDC_CHK_FOLLOW_CURRENT_DOC), m_pSetting->bFollowCurrentTab);
208208
CUtility::SetCheckboxStatus(::GetDlgItem(_hSelf, IDC_CHK_FORMAT_ON_OPEN), m_pSetting->bAutoFormat);
209209
CUtility::SetCheckboxStatus(::GetDlgItem(_hSelf, IDC_CHK_JSON_HIGHLIGHT), m_pSetting->bUseJsonHighlight);
210-
CUtility::SetCheckboxStatus(::GetDlgItem(_hSelf, IDC_CHK_IGNORE_COMMA), m_pSetting->parseOptions.bIgnoreTraillingComma);
210+
CUtility::SetCheckboxStatus(::GetDlgItem(_hSelf, IDC_CHK_IGNORE_COMMA), m_pSetting->parseOptions.bIgnoreTrailingComma);
211211
CUtility::SetCheckboxStatus(::GetDlgItem(_hSelf, IDC_CHK_IGNORE_COMMENT), m_pSetting->parseOptions.bIgnoreComment);
212212
CUtility::SetCheckboxStatus(::GetDlgItem(_hSelf, IDC_CHK_REPLACE_UNDEFINED), m_pSetting->parseOptions.bReplaceUndefined);
213213
}

0 commit comments

Comments
 (0)