mirror of
https://github.com/QB64-Phoenix-Edition/QB64pe.git
synced 2024-06-29 10:30:36 +00:00
Adds the ability to have CamelCase for internal keywords.
This commit is contained in:
parent
ee02797f1c
commit
59155c4481
|
@ -15,7 +15,7 @@ DIM SHARED IDEShowErrorsImmediately AS _BYTE
|
||||||
DIM SHARED ShowLineNumbersSeparator AS _BYTE, ShowLineNumbersUseBG AS _BYTE
|
DIM SHARED ShowLineNumbersSeparator AS _BYTE, ShowLineNumbersUseBG AS _BYTE
|
||||||
DIM SHARED IgnoreWarnings AS _BYTE, qb64versionprinted AS _BYTE
|
DIM SHARED IgnoreWarnings AS _BYTE, qb64versionprinted AS _BYTE
|
||||||
DIM SHARED DisableSyntaxHighlighter AS _BYTE, ExeToSourceFolderFirstTimeMsg AS _BYTE
|
DIM SHARED DisableSyntaxHighlighter AS _BYTE, ExeToSourceFolderFirstTimeMsg AS _BYTE
|
||||||
DIM SHARED WhiteListQB64FirstTimeMsg AS _BYTE
|
DIM SHARED WhiteListQB64FirstTimeMsg AS _BYTE, ideautolayoutkwcapitals AS _BYTE
|
||||||
|
|
||||||
IF LoadedIDESettings = 0 THEN
|
IF LoadedIDESettings = 0 THEN
|
||||||
'We only want to load the file once when QB64 first starts
|
'We only want to load the file once when QB64 first starts
|
||||||
|
@ -235,6 +235,19 @@ IF LoadedIDESettings = 0 THEN
|
||||||
idesortsubs = 0
|
idesortsubs = 0
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
|
result = ReadConfigSetting("IDE_KeywordCapital", value$)
|
||||||
|
IF result THEN
|
||||||
|
IF value$ = "TRUE" OR VAL(value$) = -1 THEN
|
||||||
|
ideautolayoutkwcapitals = -1
|
||||||
|
ELSE
|
||||||
|
ideautolayoutkwcapitals = 0
|
||||||
|
WriteConfigSetting "'[IDE DISPLAY SETTINGS]", "IDE_KeywordCapital", "FALSE"
|
||||||
|
END IF
|
||||||
|
ELSE
|
||||||
|
WriteConfigSetting "'[IDE DISPLAY SETTINGS]", "IDE_KeywordCapital", "FALSE"
|
||||||
|
ideautolayoutkwcapitals = 0
|
||||||
|
END IF
|
||||||
|
|
||||||
result = ReadConfigSetting("IDE_SUBsLength", value$)
|
result = ReadConfigSetting("IDE_SUBsLength", value$)
|
||||||
IF result THEN
|
IF result THEN
|
||||||
IF value$ = "TRUE" OR VAL(value$) = -1 THEN
|
IF value$ = "TRUE" OR VAL(value$) = -1 THEN
|
||||||
|
|
|
@ -10163,38 +10163,51 @@ FUNCTION idelayoutbox
|
||||||
|
|
||||||
'-------- init --------
|
'-------- init --------
|
||||||
i = 0
|
i = 0
|
||||||
idepar p, 60, 8, "Code Layout"
|
idepar p, 60, 9, "Code Layout"
|
||||||
|
|
||||||
i = i + 1
|
i = i + 1
|
||||||
|
ideautolayoutid = i
|
||||||
o(i).typ = 4 'check box
|
o(i).typ = 4 'check box
|
||||||
o(i).y = 2
|
o(i).y = 2
|
||||||
o(i).nam = idenewtxt("#Auto Spacing & Upper/Lowercase Formatting")
|
o(i).nam = idenewtxt("#Auto Spacing & Upper/Lowercase Formatting")
|
||||||
o(i).sel = ideautolayout
|
o(i).sel = ideautolayout
|
||||||
|
|
||||||
i = i + 1
|
i = i + 1
|
||||||
|
ideautolayoutkwcapitalsid = i
|
||||||
o(i).typ = 4 'check box
|
o(i).typ = 4 'check box
|
||||||
o(i).y = 4
|
o(i).y = 3
|
||||||
|
o(i).x = 6
|
||||||
|
o(i).nam = idenewtxt("#Keywords in CAPITALS")
|
||||||
|
o(i).sel = ideautolayoutkwcapitals
|
||||||
|
|
||||||
|
i = i + 1
|
||||||
|
ideautoindentID = i
|
||||||
|
o(i).typ = 4 'check box
|
||||||
|
o(i).y = 5
|
||||||
o(i).nam = idenewtxt("Auto #Indent -")
|
o(i).nam = idenewtxt("Auto #Indent -")
|
||||||
o(i).sel = ideautoindent
|
o(i).sel = ideautoindent
|
||||||
|
|
||||||
a2$ = str2$(ideautoindentsize)
|
a2$ = str2$(ideautoindentsize)
|
||||||
i = i + 1
|
i = i + 1
|
||||||
|
ideautoindentsizeid = i
|
||||||
o(i).typ = 1
|
o(i).typ = 1
|
||||||
o(i).x = 20
|
o(i).x = 20
|
||||||
o(i).y = 4
|
o(i).y = 5
|
||||||
o(i).nam = idenewtxt("#Spacing")
|
o(i).nam = idenewtxt("#Spacing")
|
||||||
o(i).txt = idenewtxt(a2$)
|
o(i).txt = idenewtxt(a2$)
|
||||||
o(i).v1 = LEN(a2$)
|
o(i).v1 = LEN(a2$)
|
||||||
|
|
||||||
i = i + 1
|
i = i + 1
|
||||||
|
ideindentsubsid = i
|
||||||
o(i).typ = 4
|
o(i).typ = 4
|
||||||
o(i).y = 6
|
o(i).y = 7
|
||||||
o(i).nam = idenewtxt("Indent SUBs and #FUNCTIONs")
|
o(i).nam = idenewtxt("Indent SUBs and #FUNCTIONs")
|
||||||
o(i).sel = ideindentsubs
|
o(i).sel = ideindentsubs
|
||||||
|
|
||||||
i = i + 1
|
i = i + 1
|
||||||
|
buttonsid = i
|
||||||
o(i).typ = 3
|
o(i).typ = 3
|
||||||
o(i).y = 8
|
o(i).y = 9
|
||||||
o(i).txt = idenewtxt("#OK" + sep + "#Cancel")
|
o(i).txt = idenewtxt("#OK" + sep + "#Cancel")
|
||||||
o(i).dft = 1
|
o(i).dft = 1
|
||||||
'-------- end of init --------
|
'-------- end of init --------
|
||||||
|
@ -10275,14 +10288,14 @@ FUNCTION idelayoutbox
|
||||||
IF focus <> PrevFocus THEN
|
IF focus <> PrevFocus THEN
|
||||||
'Always start with TextBox values selected upon getting focus
|
'Always start with TextBox values selected upon getting focus
|
||||||
PrevFocus = focus
|
PrevFocus = focus
|
||||||
IF focus = 3 THEN
|
IF o(focus).typ = 1 THEN
|
||||||
o(focus).v1 = LEN(idetxt(o(focus).txt))
|
o(focus).v1 = LEN(idetxt(o(focus).txt))
|
||||||
IF o(focus).v1 > 0 THEN o(focus).issel = -1
|
IF o(focus).v1 > 0 THEN o(focus).issel = -1
|
||||||
o(focus).sx1 = 0
|
o(focus).sx1 = 0
|
||||||
END IF
|
END IF
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
a$ = idetxt(o(3).txt)
|
a$ = idetxt(o(ideautoindentsizeid).txt)
|
||||||
IF LEN(a$) > 2 THEN a$ = LEFT$(a$, 2) '2 character limit
|
IF LEN(a$) > 2 THEN a$ = LEFT$(a$, 2) '2 character limit
|
||||||
FOR i = 1 TO LEN(a$)
|
FOR i = 1 TO LEN(a$)
|
||||||
a = ASC(a$, i)
|
a = ASC(a$, i)
|
||||||
|
@ -10293,18 +10306,21 @@ FUNCTION idelayoutbox
|
||||||
a = VAL(a$)
|
a = VAL(a$)
|
||||||
IF a > 64 THEN a$ = "64"
|
IF a > 64 THEN a$ = "64"
|
||||||
END IF
|
END IF
|
||||||
idetxt(o(3).txt) = a$
|
idetxt(o(ideautoindentsizeid).txt) = a$
|
||||||
|
|
||||||
IF K$ = CHR$(27) OR (focus = 6 AND info <> 0) THEN EXIT FUNCTION
|
IF K$ = CHR$(27) OR (focus = buttonsid + 1 AND info <> 0) THEN EXIT FUNCTION 'cancel
|
||||||
IF K$ = CHR$(13) OR (focus = 5 AND info <> 0) THEN
|
IF K$ = CHR$(13) OR (focus = buttonsid AND info <> 0) THEN 'ok
|
||||||
'save changes
|
'save changes
|
||||||
v% = o(1).sel: IF v% <> 0 THEN v% = 1 'ideautolayout
|
v% = o(ideautolayoutid).sel: IF v% <> 0 THEN v% = 1 'ideautolayout
|
||||||
|
|
||||||
IF ideautolayout <> v% THEN ideautolayout = v%: idelayoutbox = 1
|
IF ideautolayout <> v% THEN ideautolayout = v%: idelayoutbox = 1
|
||||||
v% = o(2).sel: IF v% <> 0 THEN v% = 1 'ideautoindent
|
|
||||||
|
|
||||||
|
v% = o(ideautolayoutkwcapitalsid).sel: IF v% <> 0 THEN v% = 1 'ideautolayoutkwcapitals
|
||||||
|
IF ideautolayoutkwcapitals <> v% THEN ideautolayoutkwcapitals = v%: idelayoutbox = 1
|
||||||
|
|
||||||
|
v% = o(ideautoindentid).sel: IF v% <> 0 THEN v% = 1 'ideautoindent
|
||||||
IF ideautoindent <> v% THEN ideautoindent = v%: idelayoutbox = 1
|
IF ideautoindent <> v% THEN ideautoindent = v%: idelayoutbox = 1
|
||||||
v$ = idetxt(o(3).txt) 'ideautoindentsize
|
|
||||||
|
v$ = idetxt(o(ideautoindentsizeid).txt) 'ideautoindentsize
|
||||||
IF v$ = "" THEN v$ = "4"
|
IF v$ = "" THEN v$ = "4"
|
||||||
v% = VAL(v$)
|
v% = VAL(v$)
|
||||||
IF v% < 0 OR v% > 64 THEN v% = 4
|
IF v% < 0 OR v% > 64 THEN v% = 4
|
||||||
|
@ -10313,7 +10329,7 @@ FUNCTION idelayoutbox
|
||||||
IF ideautoindent <> 0 THEN idelayoutbox = 1
|
IF ideautoindent <> 0 THEN idelayoutbox = 1
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
v% = o(4).sel: IF v% <> 0 THEN v% = 1 'ideindentsubs
|
v% = o(ideindentsubsid).sel: IF v% <> 0 THEN v% = 1 'ideindentsubs
|
||||||
IF ideindentsubs <> v% THEN ideindentsubs = v%: idelayoutbox = 1
|
IF ideindentsubs <> v% THEN ideindentsubs = v%: idelayoutbox = 1
|
||||||
|
|
||||||
IF ideautolayout THEN
|
IF ideautolayout THEN
|
||||||
|
@ -10321,6 +10337,11 @@ FUNCTION idelayoutbox
|
||||||
ELSE
|
ELSE
|
||||||
WriteConfigSetting "'[IDE DISPLAY SETTINGS]", "IDE_AutoFormat", "FALSE"
|
WriteConfigSetting "'[IDE DISPLAY SETTINGS]", "IDE_AutoFormat", "FALSE"
|
||||||
END IF
|
END IF
|
||||||
|
IF ideautolayoutkwcapitals THEN
|
||||||
|
WriteConfigSetting "'[IDE DISPLAY SETTINGS]", "IDE_KeywordCapital", "TRUE"
|
||||||
|
ELSE
|
||||||
|
WriteConfigSetting "'[IDE DISPLAY SETTINGS]", "IDE_KeywordCapital", "FALSE"
|
||||||
|
END IF
|
||||||
IF ideautoindent THEN
|
IF ideautoindent THEN
|
||||||
WriteConfigSetting "'[IDE DISPLAY SETTINGS]", "IDE_AutoIndent", "TRUE"
|
WriteConfigSetting "'[IDE DISPLAY SETTINGS]", "IDE_AutoIndent", "TRUE"
|
||||||
ELSE
|
ELSE
|
||||||
|
|
460
source/qb64.bas
460
source/qb64.bas
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue