6 files changed, 56 insertions, 7 deletions
diff --git a/lexlib/DefaultLexer.cxx b/lexlib/DefaultLexer.cxx
index 9ca39b44a..e0f61084e 100644
--- a/lexlib/DefaultLexer.cxx
+++ b/lexlib/DefaultLexer.cxx
@@ -24,8 +24,12 @@ using namespace Scintilla;
 
 static const char styleSubable[] = { 0 };
 
-DefaultLexer::DefaultLexer(const LexicalClass *lexClasses_, size_t nClasses_) :
-	lexClasses(lexClasses_), nClasses(nClasses_) {
+DefaultLexer::DefaultLexer(const char *languageName_, int language_,
+	const LexicalClass *lexClasses_, size_t nClasses_) :
+	languageName(languageName_),
+	language(language_),
+	lexClasses(lexClasses_),
+	nClasses(nClasses_) {
 }
 
 DefaultLexer::~DefaultLexer() {
@@ -36,7 +40,7 @@ void SCI_METHOD DefaultLexer::Release() {
 }
 
 int SCI_METHOD DefaultLexer::Version() const {
-	return lvMetaData;
+	return lvIdentity;
 }
 
 const char * SCI_METHOD DefaultLexer::PropertyNames() {
@@ -123,3 +127,13 @@ const char * SCI_METHOD DefaultLexer::TagsOfStyle(int style) {
 const char * SCI_METHOD DefaultLexer::DescriptionOfStyle(int style) {
 	return (style < NamedStyles()) ? lexClasses[style].description : "";
 }
+
+// ILexerWithIdentity methods
+const char * SCI_METHOD DefaultLexer::GetName() {
+	return languageName;
+}
+
+int SCI_METHOD DefaultLexer::GetIdentifier() {
+	return language;
+}
+
diff --git a/lexlib/DefaultLexer.h b/lexlib/DefaultLexer.h
index 636bd0690..7856a1dd1 100644
--- a/lexlib/DefaultLexer.h
+++ b/lexlib/DefaultLexer.h
@@ -13,11 +13,14 @@
 namespace Scintilla {
 
 // A simple lexer with no state
-class DefaultLexer : public ILexerWithMetaData {
+class DefaultLexer : public ILexerWithIdentity {
+	const char *languageName;
+	int language;
 	const LexicalClass *lexClasses;
 	size_t nClasses;
 public:
-	DefaultLexer(const LexicalClass *lexClasses_ = nullptr, size_t nClasses_ = 0);
+	DefaultLexer(const char *languageName_, int language_,
+		const LexicalClass *lexClasses_ = nullptr, size_t nClasses_ = 0);
 	virtual ~DefaultLexer();
 	void SCI_METHOD Release() override;
 	int SCI_METHOD Version() const override;
@@ -44,6 +47,9 @@ public:
 	const char * SCI_METHOD NameOfStyle(int style) override;
 	const char * SCI_METHOD TagsOfStyle(int style) override;
 	const char * SCI_METHOD DescriptionOfStyle(int style) override;
+	// ILexerWithIdentity methods
+	const char * SCI_METHOD GetName() override;
+	int SCI_METHOD GetIdentifier() override;
 };
 
 }
diff --git a/lexlib/LexerBase.cxx b/lexlib/LexerBase.cxx
index 655f96be6..97edc621c 100644
--- a/lexlib/LexerBase.cxx
+++ b/lexlib/LexerBase.cxx
@@ -44,7 +44,7 @@ void SCI_METHOD LexerBase::Release() {
 }
 
 int SCI_METHOD LexerBase::Version() const {
-	return lvMetaData;
+	return lvIdentity;
 }
 
 const char * SCI_METHOD LexerBase::PropertyNames() {
@@ -69,6 +69,10 @@ Sci_Position SCI_METHOD LexerBase::PropertySet(const char *key, const char *val)
 	}
 }
 
+const char *SCI_METHOD LexerBase::PropertyGet(const char *key) {
+	return props.Get(key);
+}
+
 const char * SCI_METHOD LexerBase::DescribeWordListSets() {
 	return "";
 }
@@ -139,3 +143,13 @@ const char * SCI_METHOD LexerBase::TagsOfStyle(int style) {
 const char * SCI_METHOD LexerBase::DescriptionOfStyle(int style) {
 	return (style < NamedStyles()) ? lexClasses[style].description : "";
 }
+
+// ILexerWithIdentity methods
+
+const char *SCI_METHOD LexerBase::GetName() {
+	return "";
+}
+
+int SCI_METHOD LexerBase::GetIdentifier() {
+	return SCLEX_AUTOMATIC;
+}
diff --git a/lexlib/LexerBase.h b/lexlib/LexerBase.h
index afeaa8038..a023d0fe1 100644
--- a/lexlib/LexerBase.h
+++ b/lexlib/LexerBase.h
@@ -11,7 +11,7 @@
 namespace Scintilla {
 
 // A simple lexer with no state
-class LexerBase : public ILexerWithMetaData {
+class LexerBase : public ILexerWithIdentity {
 protected:
 	const LexicalClass *lexClasses;
 	size_t nClasses;
@@ -46,6 +46,10 @@ public:
 	const char * SCI_METHOD NameOfStyle(int style) override;
 	const char * SCI_METHOD TagsOfStyle(int style) override;
 	const char * SCI_METHOD DescriptionOfStyle(int style) override;
+	// ILexerWithIdentity methods
+	const char * SCI_METHOD GetName() override;
+	int SCI_METHOD GetIdentifier() override;
+	const char *SCI_METHOD PropertyGet(const char *key) override;
 };
 
 }
diff --git a/lexlib/LexerSimple.cxx b/lexlib/LexerSimple.cxx
index 0be7d97ca..e69c44ad6 100644
--- a/lexlib/LexerSimple.cxx
+++ b/lexlib/LexerSimple.cxx
@@ -51,3 +51,11 @@ void SCI_METHOD LexerSimple::Fold(Sci_PositionU startPos, Sci_Position lengthDoc
 		astyler.Flush();
 	}
 }
+
+const char * SCI_METHOD LexerSimple::GetName() {
+	return module->languageName;
+}
+
+int SCI_METHOD LexerSimple::GetIdentifier() {
+	return module->GetLanguage();
+}
diff --git a/lexlib/LexerSimple.h b/lexlib/LexerSimple.h
index 87882eaeb..a2589cf44 100644
--- a/lexlib/LexerSimple.h
+++ b/lexlib/LexerSimple.h
@@ -19,6 +19,9 @@ public:
 	const char * SCI_METHOD DescribeWordListSets() override;
 	void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, IDocument *pAccess) override;
 	void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, IDocument *pAccess) override;
+	// ILexerWithIdentity methods
+	const char * SCI_METHOD GetName() override;
+	int SCI_METHOD  GetIdentifier() override;
 };
 
 }