Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Formatting changes #611

Merged
merged 9 commits into from
Feb 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions source/ide/config/cfg_global.bas
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
DIM SHARED AS LONG IDEAutoLayout, IDEAutoLayoutKwCapitals, IDEAutoIndent, IDEAutoIndentSize, IDEIndentSubs
DIM SHARED AS LONG IDEAutoLayout, IDEAutoLayoutKwStyle, IDEAutoIndent, IDEAutoIndentSize, IDEIndentSubs
DIM SHARED IDECommentColor AS _UNSIGNED LONG, IDEMetaCommandColor AS _UNSIGNED LONG
DIM SHARED IDEQuoteColor AS _UNSIGNED LONG, IDETextColor AS _UNSIGNED LONG
DIM SHARED IDEBackgroundColor AS _UNSIGNED LONG, IDEChromaColor AS _UNSIGNED LONG
Expand All @@ -10,7 +10,7 @@ DIM SHARED IDE_BypassAutoPosition AS _BYTE, idesortsubs AS _BYTE, IDESubsLength
DIM SHARED IDENormalCursorStart AS LONG, IDENormalCursorEnd AS LONG
DIM SHARED MouseButtonSwapped AS _BYTE
DIM SHARED PasteCursorAtEnd AS _BYTE
DIM SHARED SaveExeWithSource AS _BYTE, EnableQuickNav AS _BYTE
DIM SHARED SaveExeWithSource AS LONG, EnableQuickNav AS _BYTE
DIM SHARED IDEShowErrorsImmediately AS _BYTE
DIM SHARED ShowLineNumbersSeparator AS _BYTE, ShowLineNumbersUseBG AS _BYTE
DIM SHARED IgnoreWarnings AS _BYTE, qb64versionprinted AS _BYTE
Expand Down
23 changes: 15 additions & 8 deletions source/ide/config/cfg_methods.bas
Original file line number Diff line number Diff line change
Expand Up @@ -320,15 +320,22 @@ SUB ReadInitialConfig
WriteConfigSetting displaySettingsSection$, "IDE_SortSUBs", "False"
END IF

tmpKwCap = _FALSE: tmpKwLow = _FALSE
IF ReadConfigSetting(displaySettingsSection$, "IDE_KeywordCapital", value$) THEN
IF UCASE$(value$) = "TRUE" OR VAL(value$) = -1 THEN
IDEAutoLayoutKwCapitals = _TRUE
ELSE
IDEAutoLayoutKwCapitals = _FALSE
WriteConfigSetting displaySettingsSection$, "IDE_KeywordCapital", "False"
END IF
ELSE
IDEAutoLayoutKwCapitals = _FALSE
IF UCASE$(value$) = "TRUE" OR VAL(value$) = -1 THEN tmpKwCap = _TRUE ELSE tmpKwCap = _FALSE
END IF
IF ReadConfigSetting(displaySettingsSection$, "IDE_KeywordLowercase", value$) THEN
IF UCASE$(value$) = "TRUE" OR VAL(value$) = -1 THEN tmpKwLow = _TRUE ELSE tmpKwLow = _FALSE
END IF
IF tmpKwCap = tmpKwLow THEN 'both set or unset = CaMeL case
IDEAutoLayoutKwStyle = 0
WriteConfigSetting displaySettingsSection$, "IDE_KeywordCapital", "False"
WriteConfigSetting displaySettingsSection$, "IDE_KeywordLowercase", "False"
ELSEIF tmpKwCap = _TRUE THEN '= UPPER case
IDEAutoLayoutKwStyle = 1
WriteConfigSetting displaySettingsSection$, "IDE_KeywordLowercase", "False"
ELSEIF tmpKwLow = _TRUE THEN '= lower case
IDEAutoLayoutKwStyle = -1
WriteConfigSetting displaySettingsSection$, "IDE_KeywordCapital", "False"
END IF

Expand Down
2 changes: 1 addition & 1 deletion source/ide/ide_export.bas
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ SUB ExportCodeAs (docFormat$)
VerifyKeyword:
IF me% THEN veri$ = me$: ELSE veri$ = kw$
IF ASC(veri$, 1) <> 95 THEN flp% = 1: ELSE flp% = 2
IF (ASC(veri$, flp%) < 91 OR MID$(veri$, flp%, 2) = "gl") AND (INSTR(listOfKeywords$, "@" + UCASE$(veri$) + "@") > 0) THEN
IF (isalpha(ASC(veri$, flp%))) AND (INSTR(listOfKeywords$, "@" + UCASE$(veri$) + "@") > 0) THEN
IF me% AND le% THEN
IF INSTR("$DYNAMIC$INCLUDE$STATIC", UCASE$(veri$)) = 0 THEN me$ = ""
ELSEIF me% AND NOT le% THEN
Expand Down
Loading
Loading