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

IDE-569 Syntax highlight KEL #340

Merged
merged 1 commit into from Dec 16, 2016

Conversation

dehilsterlexis
Copy link
Contributor

Fixed IDE-569

Signed-off-by: dehilsterlexis david.dehilster@lexisnexis.com

@hpcc-jirabot
Copy link

@dehilsterlexis
Copy link
Contributor Author

@GordonSmith I would like to do a walk through the code concerning the use of the boost xml archive for a new file for sample language text. The code is commented out but can be easily tested. It should work but is not. I would prefer to use the file instead of hard coding the text. I will highlight the text in a comment.


if (m_langRef)
{
//m_langRef->loadSamples();
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@GordonSmith here is the boost archive load I have commented out on line 1416.

Copy link
Member

@GordonSmith GordonSmith left a comment

Choose a reason for hiding this comment

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

Looks good - some minor comments / questions.

@@ -0,0 +1,173 @@
// Scintilla source code edit control
/** @file LexKEL.cxx
Copy link
Member

Choose a reason for hiding this comment

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

Comment looks wrong - I would remove it in its entirety

0,
};

LexerModule lmGENERAL(SCLEX_GENERAL, ColouriseGENERALDocSensitive, "general", FoldGENERALDoc, generalWordLists);
Copy link
Member

Choose a reason for hiding this comment

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

What is the goal of the General lexer?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The general lexer is for non-language related color selections. I tried coding the "general" color settings without the lexer. After a 1 day trip down that road without success and everything broken beyond repair and only getting worse, I decided the easiest way to implement the non-language specific color preferences was to create a "general" lexer. It solved that problem quite nicely.

** Lexer for C++, C, Java, and JavaScript.
**/
// Copyright 1998-2005 by Neil Hodgson <neilh@scintilla.org>
// The License.txt file describes the conditions under which this software may be distributed.
Copy link
Member

Choose a reason for hiding this comment

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

Remove comment block

@@ -537,6 +537,7 @@
#define IDC_STATIC_WUARGUMENTS 524
#define IDC_COMBO1 524
#define IDC_COMBO_MODULES 524
#define IDC_COMBO_ELEMENT_TYPE 524
Copy link
Member

Choose a reason for hiding this comment

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

Should it have its own ID?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This was auto-generated by VisualStudio. I did it via the GUI editor.

Copy link
Member

Choose a reason for hiding this comment

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

I think that is fine, as long as none of those IDs clash on the window in question. But in general you can go in and tidy them up by hand.

Fixed IDE-569

Signed-off-by: dehilsterlexis <david.dehilster@lexisnexis.com>
@dehilsterlexis
Copy link
Contributor Author

@GordonSmith fixed the comments in the Lexer files and answered your questions.

@GordonSmith
Copy link
Member

@richardkchapman This is ok to pull (into master)

@richardkchapman richardkchapman merged commit 896c87f into hpcc-systems:master Dec 16, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants