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

Jump to bottom

Added Hollywood support v2 #13417

Closed
wants to merge 2 commits into from
Closed

Added Hollywood support v2 #13417

wants to merge 2 commits into from

Conversation

afalkenhahn
Copy link
Contributor

Lexilla already has a lexer for the Hollywood programming language but apparently Notepad++ doesn't support this yet. This PR adds support for the Hollywood programming language in Notepad++ and also includes all the language keywords as well as core and plugin APIs and the regex for the function lister. I've tested everything and it's working.

@afalkenhahn afalkenhahn mentioned this pull request Mar 25, 2023
Closed
rdipardo
rdipardo reviewed Mar 26, 2023
View reviewed changes
PowerEditor/installer/themes/Zenburn.xml Outdated
@@ -535,6 +535,24 @@ License: GPL2
<WordsStyle name="COMMENT BLOCK2" styleID="15" fgColor="7F9F7F" bgColor="3F3F3F" fontName="" fontStyle="2" fontSize="" />
<WordsStyle name="COMMENT BLOCK3" styleID="16" fgColor="7F9F7F" bgColor="3F3F3F" fontName="" fontStyle="2" fontSize="" />
</LexerType>
</LexerType>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The repeated </LexerType> end-tag is failing the XML check.

Try this:

diff --git a/PowerEditor/installer/themes/Zenburn.xml b/PowerEditor/installer/themes/Zenburn.xml
index 800e3341..b8025e09 100644
--- a/PowerEditor/installer/themes/Zenburn.xml
+++ b/PowerEditor/installer/themes/Zenburn.xml
@@ -535,7 +535,6 @@ License:             GPL2
             <WordsStyle name="COMMENT BLOCK2" styleID="15" fgColor="7F9F7F" bgColor="3F3F3F" fontName="" fontStyle="2" fontSize="" />
             <WordsStyle name="COMMENT BLOCK3" styleID="16" fgColor="7F9F7F" bgColor="3F3F3F" fontName="" fontStyle="2" fontSize="" />
         </LexerType>
-        </LexerType>
         <LexerType name="hollywood" desc="Hollywood" ext="">
             <WordsStyle name="DEFAULT" styleID="0" fgColor="DCDCCC" bgColor="3F3F3F" fontName="" fontStyle="0" fontSize="" />
             <WordsStyle name="COMMENT" styleID="1" fgColor="7F9F7F" bgColor="3F3F3F" fontName="" fontStyle="0" fontSize="" />

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@afalkenhahn
Please consider @rdipardo's suggestion to remove close tag </LexerType>

@donho donho self-assigned this Mar 26, 2023
@chcg chcg added the language-support Issues or PRs related to programming languages (also e.g. in styles, themes) label Mar 26, 2023
donho
donho requested changes Mar 26, 2023
View reviewed changes
Copy link
Member

@donho donho left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please consider the suggestions:

PowerEditor/installer/themes/Zenburn.xml Outdated
@@ -535,6 +535,24 @@ License: GPL2
<WordsStyle name="COMMENT BLOCK2" styleID="15" fgColor="7F9F7F" bgColor="3F3F3F" fontName="" fontStyle="2" fontSize="" />
<WordsStyle name="COMMENT BLOCK3" styleID="16" fgColor="7F9F7F" bgColor="3F3F3F" fontName="" fontStyle="2" fontSize="" />
</LexerType>
</LexerType>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@afalkenhahn
Please consider @rdipardo's suggestion to remove close tag </LexerType>

PowerEditor/installer/filesForTesting/overrideMap.xml
@@ -97,7 +97,8 @@
<association id= "visualprolog.xml" langID= "84"/>
<association id= "typescript.xml" langID= "85"/>
<association id= "gdscript.xml" langID= "88"/>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please modify it to:
<association id= "gdscript.xml" langID= "87"/>

PowerEditor/installer/filesForTesting/overrideMap.xml
@@ -97,7 +97,8 @@
<association id= "visualprolog.xml" langID= "84"/>
<association id= "typescript.xml" langID= "85"/>
<association id= "gdscript.xml" langID= "88"/>

<association id= "hollywood.xml" langID= "89"/>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please modify it to:
<association id= "hollywood.xml" langID= "88"/>

PowerEditor/installer/functionList/overrideMap.xml
@@ -97,7 +97,8 @@
<association id= "visualprolog.xml" langID= "84"/>
<association id= "typescript.xml" langID= "85"/>
<association id= "gdscript.xml" langID= "88"/>

<association id= "hollywood.xml" langID= "89"/>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please modify the above 2 lines to:

<association id= "gdscript.xml"  	 langID= "87"/>
<association id= "hollywood.xml"  	 langID= "88"/>

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@donho

Please modify the above 2 lines to:

<association id= "gdscript.xml"  	 langID= "87"/>
<association id= "hollywood.xml"  	 langID= "88"/>

Are you sure? I think my version is correct because L_GDSCRIPT is 88 and L_HOLLYWOOD is 89 so that's why they should use 88 and 89 in the XMLs as well, shouldn't they? Also note that gdscript.xml uses 88 in master.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@afalkenhahn
OK. I will merge this PR and fix it if it's really needed.
Thank you for the quick fix.

@donho donho added the accepted label Mar 26, 2023
@donho donho closed this in d21f7cb Mar 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rdipardo rdipardo rdipardo left review comments

@donho donho donho approved these changes

Assignees

@donho donho

Labels
accepted language-support Issues or PRs related to programming languages (also e.g. in styles, themes)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@afalkenhahn @donho @rdipardo @chcg