Fix for special chars in file name upon article fetch.

out/production/wikimedia/META-INF/plugin.xml

@@ -1,7 +1,7 @@
 <idea-plugin version="2">
   <id>org.wikipedia.tools.puggle</id>
   <name>Puggle</name>
-  <version>0.7a</version>
+  <version>0.9a</version>
   <vendor email="[email protected]" url="http://www.wikipedia.org">YourCompany</vendor>
 
   <description><![CDATA[
@@ -17,9 +17,7 @@
 
   <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
        on how to target different products -->
-  <!-- uncomment to enable plugin in all products
   <depends>com.intellij.modules.lang</depends>
-  -->
 
   <extensions defaultExtensionNs="com.intellij">
     <!-- Add your extensions here -->
@@ -38,6 +36,7 @@
     <completion.contributor language="MediaWiki" implementationClass="com.mwplugin.MediaWikiCompletionContributor"/>
     <lang.braceMatcher language="MediaWiki" implementationClass="com.mwplugin.MediaWikiPairedBraceMatcher"/>
     <editorTypedHandler implementationClass="com.mwplugin.bracematching.TagMatchTypedActionHandler"/>
+    <lang.commenter language="MediaWiki" implementationClass="com.mwplugin.MediaWikiCommenter"/>
   </extensions>
 
 

out/production/wikimedia/com/mwplugin/mediawiki.bnf

@@ -31,14 +31,15 @@
         tablestart = "{|"
         tableend = "|}"
         tableheaderdoubledelimiter = "!!"
-        tablecelldoubledelimiter = "||"
+        doublepipe = "||"
         htmlcommentopen = "<!--"
-        htmlcomentclose = "-->"
+        htmlcommentclose = "-->"
         openbracket = "["
         closebracket = "]"
         refopencomplete = "<ref>"
         refopen = "<ref"
         refclose = "</ref>"
+        htmltagselfclose = "/>"
         openbracket2 = "[["
         closebracket2 = "]]"
         newline='regexp:[\r\n]'
@@ -183,7 +184,7 @@ symbol ::=
 	underscore|
 	"."|
 	","|
-	"("|")"|"-"|":"|"#"|"/"|"'"|";"|"|"|"–"|doublequote|"!"|"%"|"?"|"_"|"—"|"+"|"$"|"~"|"·"|"’"|equals|"†"|"½"|"*"|"@"|"−"|"‘"|"^"|"ᴥ"|"•"|"…"
+	"("|")"|"-"|":"|"#"|"/"|"'"|";"|"|"|"–"|doublequote|"!"|"%"|"?"|"_"|"—"|"+"|"$"|"~"|"·"|"’"|equals|"†"|"½"|"*"|"@"|"−"|"‘"|"^"|"ᴥ"|"•"|"…"|"`"|tableheaderdoubledelimiter|"“"|"”"|htmltagselfclose
 {
     mixin="com.mwplugin.psi.impl.MediaWikiNamedElementImpl"
     implements="com.mwplugin.psi.IMediaWikiNamedElement"
@@ -537,7 +538,7 @@ link ::=
 }
 
 internal-link ::=
-	internal-link-start article-link ("#" section-id)? ("|" (internal-link-property | internal-link-unassigned-property))* internal-link-end extra-description?
+	internal-link-start article-link ("#" section-id)? (("|"|doublepipe) (internal-link-property | internal-link-unassigned-property))* internal-link-end extra-description?
 {
     mixin="com.mwplugin.psi.impl.MediaWikiNamedElementImpl"
     implements="com.mwplugin.psi.IMediaWikiNamedElement"
@@ -961,12 +962,12 @@ media-extension ::=
     implements="com.mwplugin.psi.IMediaWikiNamedElement"
 }
 
-html-tag ::= "<!" html-tag-name html-tag-properties? ((">" html-tag-content html-tag-close)|"/>")
+html-tag ::= ("<!" html-tag-name html-tag-properties? ((">" html-tag-content html-tag-close)|"/>")) | html-tag-linebreak
 html-tag-close ::= "</" html-tag-name ">"
 html-tag-properties ::= (!">" (letter | decimaldigit | symbol | whitespace))*
 html-tag-name ::= (letter | decimaldigit)+
 html-tag-content ::= paragraph
-
+html-tag-linebreak ::= "<br" whitespace? "/>"
 
 text-with-formatting ::=
 	formatted-text |
@@ -1008,19 +1009,19 @@ bold-text ::=
 }
 
 italic-text ::=
-	quote2 inline-text quote2
+	quote2 inline-text (quote2|quote3)
 {
     mixin="com.mwplugin.psi.impl.MediaWikiNamedElementImpl"
     implements="com.mwplugin.psi.IMediaWikiNamedElement"
 }
 
 noparse-block ::=
+	html-comment|
 	nowiki-block|
 	html-block|
 	reference-block|
 //	math-block|
-	pre-block|
-	html-comment
+	pre-block
 {
     mixin="com.mwplugin.psi.impl.MediaWikiNamedElementImpl"
     implements="com.mwplugin.psi.IMediaWikiNamedElement"
@@ -1087,13 +1088,13 @@ named-reference-block-url ::=
 }
 
 named-reference-block-self-closing ::=
-	reference-opening-tag whitespace?  (("name" | "group") whitespace? "=" property-assignment)+ "/" unescapedgreaterthan
+	reference-opening-tag whitespace?  (("name" | "group") whitespace? "=" property-assignment)+ htmltagselfclose
 {
     mixin="com.mwplugin.psi.impl.MediaWikiNamedElementImpl"
     implements="com.mwplugin.psi.IMediaWikiNamedElement"
 }
 
-reference-content ::= paragraph-and-more
+reference-content ::= all-inline-elements*
 
 //Don't need quotes unless you have whitespace
 property-assignment ::= (whitespace? doublequote? reference-name doublequote? whitespace?)//|(whitespace? doublequote reference-name whitespace doublequote whitespace?)
@@ -1120,6 +1121,8 @@ html-opening-tag ::=
     implements="com.mwplugin.psi.IMediaWikiNamedElement"
 }
 
+
+
 reference-opening-tag-complete ::=
 	refopencomplete
 
@@ -1179,7 +1182,7 @@ pre-closing-tag ::=
 }
 
 html-comment ::=
-	htmlcommentopen whitespace? paragraph whitespace? htmlcommentclose
+	htmlcommentopen whitespace? all-inline-elements* whitespace? htmlcommentclose
 {
     mixin="com.mwplugin.psi.impl.MediaWikiNamedElementImpl"
     implements="com.mwplugin.psi.IMediaWikiNamedElement"
@@ -1257,7 +1260,7 @@ plain-text ::=
     implements="com.mwplugin.psi.IMediaWikiNamedElement"
 }
 
-friendly-ref-link-char ::= ("!"|"$"|"%"|"&"|"("")"|"*"|","|"-"|"."|":"|";"|"<"|"@"|"["|"]"|"^"|"_"|"`"|"{"|"|"|"}"|"~"|letter|decimaldigit|"–"|"'")
+friendly-ref-link-char ::= ("!"|"$"|"%"|"&"|"("")"|"*"|","|"-"|"."|":"|";"|"<"|"@"|"["|"]"|"^"|"_"|"`"|"{"|"|"|"}"|"~"|letter|decimaldigit|"–"|"'"|"/"|template-block)
 
 unicode-wiki ::=
 	letter |
@@ -1398,7 +1401,7 @@ bullet-item ::=
 }
 
 table ::=
-	table-start (space table-parameters)? (table-block)*  newline? table-end
+	table-start (space? table-parameters)? (table-block)*  newline? table-end
 {
     mixin="com.mwplugin.psi.impl.MediaWikiNamedElementImpl"
     implements="com.mwplugin.psi.IMediaWikiNamedElement"
@@ -1412,7 +1415,7 @@ table-parameters ::=
     implements="com.mwplugin.psi.IMediaWikiNamedElement"
 }
 
-table-cell-double-delimited-start ::= tablecelldoubledelimiter
+table-cell-double-delimited-start ::= doublepipe
 table-cell-double-delimited ::=  table-cell-double-delimited-start cell-content newline?
 {
     mixin="com.mwplugin.psi.impl.MediaWikiNamedElementImpl"
@@ -1490,7 +1493,7 @@ cell-formatting ::= cell-content
     implements="com.mwplugin.psi.IMediaWikiNamedElement"
 }
 
-cell-content ::= ((!tableheaderdoubledelimiter !tablecelldoubledelimiter !(newline whitespace? (tablesectionstart | tablesectionstartcaptionable))) (!(newline whitespace? "|}")) !(newline whitespace? "|") (!(newline whitespace? "!")) all-inline-elements)*
+cell-content ::= ((!tableheaderdoubledelimiter !doublepipe !(newline whitespace? (tablesectionstart | tablesectionstartcaptionable))) (!(newline whitespace? "|}")) !(newline whitespace? "|") (!(newline whitespace? "!")) all-inline-elements)*
 {
     mixin="com.mwplugin.psi.impl.MediaWikiNamedElementImpl"
     implements="com.mwplugin.psi.IMediaWikiNamedElement"

resources/META-INF/plugin.xml

@@ -1,7 +1,7 @@
 <idea-plugin version="2">
   <id>org.wikipedia.tools.puggle</id>
   <name>Puggle</name>
-  <version>0.7a</version>
+  <version>0.9a</version>
   <vendor email="[email protected]" url="http://www.wikipedia.org">YourCompany</vendor>
 
   <description><![CDATA[

src/com/mwplugin/MediaWikiUtil.java

@@ -60,4 +60,18 @@ public static List<MediaWikiProperty> findProperties(Project project)
 		}
 		return result;
 	}*/
+
+	public static String sanitizeFileName(String fileName)
+	{
+		fileName = fileName.replace("<", "");
+		fileName = fileName.replace(">", "");
+		fileName = fileName.replace(":", "");
+		fileName = fileName.replace("\"", "");
+		fileName = fileName.replace("/", "");
+		fileName = fileName.replace("\\", "");
+		fileName = fileName.replace("|", "");
+		fileName = fileName.replace("?", "");
+		fileName = fileName.replace("*", "");
+		return fileName;
+	}
 }

src/com/mwplugin/actions/OpenWikipediaArticleAction.java

@@ -36,6 +36,7 @@
 import java.io.IOException;
 import java.util.Objects;
 
+import static com.intellij.openapi.util.io.FileUtil.sanitizeFileName;
 import static com.mwplugin.api.WPApiManager.getPageContent;
 import static com.mwplugin.psi.MediaWikiElementFactory.createFile;
 
@@ -90,7 +91,8 @@ public void actionPerformed(AnActionEvent e)
 			}
 
 			String fileName = templateDialog.selectedArticle.getName();
-
+			fileName = sanitizeFileName(fileName);
+			fileName = fileName.replace("_", " "); //Because I like spaces!
 			ScratchFileService.Option option = ScratchFileService.Option.create_if_missing;
 			VirtualFile f = ScratchRootType.getInstance().createScratchFile(e.getProject(), PathUtil.makeFileName(fileName, "mediawiki"), MediaWikiLanguage.INSTANCE, content, option);
 			if (f != null) {

src/com/mwplugin/dialogs/InsertTemplate.java

@@ -1,5 +1,8 @@
 package com.mwplugin.dialogs;
 
+import com.intellij.codeInsight.completion.InsertHandler;
+import com.intellij.codeInsight.completion.InsertionContext;
+import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.openapi.editor.event.DocumentEvent;
 import com.intellij.openapi.editor.event.DocumentListener;
 import com.intellij.openapi.project.Project;
@@ -79,7 +82,19 @@ protected String getLookupString(@NotNull Article item)
 				return item.getName();
 			}
 
-
+			@Nullable
+			@Override
+			protected InsertHandler<LookupElement> createInsertHandler(@NotNull Article item)
+			{
+				return new InsertHandler<LookupElement>()
+				{
+					@Override
+					public void handleInsert(InsertionContext context, LookupElement item)
+					{
+						_textField.setText(item.getLookupString());
+					}
+				};
+			}
 		};
 
 
@@ -103,9 +118,10 @@ protected String getLookupString(@NotNull Article item)
 				@Override
 				public void beforeDocumentChange(DocumentEvent event)
 				{
-					System.out.println("asdsa");
+
 				}
 
+
 				@Override
 				public void documentChanged(DocumentEvent event)
 				{

src/com/mwplugin/mediawiki.bnf

@@ -1121,6 +1121,8 @@ html-opening-tag ::=
     implements="com.mwplugin.psi.IMediaWikiNamedElement"
 }
 
+
+
 reference-opening-tag-complete ::=
 	refopencomplete