Skip to content
This repository was archived by the owner on Apr 2, 2024. It is now read-only.

Add support for reading autocompletion files when language definition is in userDefineLangs directory #270

Merged
jcaillon merged 1 commit into from
Jan 10, 2020
Merged

Add support for reading autocompletion files when language definition is in userDefineLangs directory #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 0 deletions 3PA/NppCore/NppConf.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,10 @@ internal class NppConf {
/// </summary>
public bool MultiSelectionEnabled { get; private set; }

public string DirectoryNppUserDefineLangs {
get { return Path.Combine(FolderBaseConf, @"userDefineLangs"); }
}

public string FileNppUserDefinedLang {
get { return Path.Combine(FolderBaseConf, @"userDefineLang.xml"); }
}
Expand Down
11 changes: 11 additions & 0 deletions 3PA/NppCore/NppLang.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,17 @@ public NppLangs() {
} catch (Exception e) {
ErrorHandler.LogError(e, "Error parsing " + Npp.ConfXml.FileNppStylersXml);
}

// from directory userDefineLangs/
try {
var filenames = Directory.GetFiles(Npp.ConfXml.DirectoryNppUserDefineLangs, "*.xml");
var nodes = filenames.Select(filename => new NanoXmlDocument(Utils.ReadAllText(filename)).RootNode["UserLang"]);
FillDictionaries(nodes.ToList());
}
catch (Exception e) {
ErrorHandler.LogError(e, "Error parsing " + Npp.ConfXml.FileNppLangsXml);
}

}

/// <summary>
Expand Down