Skip to content

Commit

Permalink
Completed structure view (wipes off forehead)
Browse files Browse the repository at this point in the history
  • Loading branch information
@drewmutt
drewmutt committed May 5, 2017
1 parent 1a77cf0 commit 08a7a2e
Show file tree
Hide file tree
Showing 21 changed files with 1,285 additions and 556 deletions.
894 changes: 511 additions & 383 deletions .idea/workspace.xml
View file

Large diffs are not rendered by default.

367 changes: 330 additions & 37 deletions gen/com/mwplugin/parser/MediaWikiParser.java
View file

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions gen/com/mwplugin/psi/MediaWikiTypes.java
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions gen/com/mwplugin/psi/MediaWikiVisitor.java
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion out/production/wikimedia/META-INF/plugin.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<lang.syntaxHighlighterFactory language="MediaWiki" implementationClass="com.mwplugin.MediaWikiSyntaxHighlighterFactory"/>
<colorSettingsPage implementation="com.mwplugin.MediaWikiColorSettingsPage"/>
<additionalTextAttributes scheme="Darcula" file="colorSchemes/MediaWikiDefault.xml"/>
<lang.psiStructureViewFactory language="MediaWiki" implementationClass="com.mwplugin.MediaWikiStructureViewFactory"/>
<lang.psiStructureViewFactory language="MediaWiki" implementationClass="com.mwplugin.structure.MediaWikiStructureViewFactory"/>
<!--<fileEditorProvider implementation="com.mwplugin.preview.MarkdownSplitEditorProvider"/>-->
<moduleConfigurationEditorProvider implementation="com.mwplugin.module.ModuleConfigurationProvider"/>
<annotator language="MediaWiki" implementationClass="com.mwplugin.MediaWikiAnnotator"/>
Expand Down
25 changes: 15 additions & 10 deletions out/production/wikimedia/com/mwplugin/mediawiki.bnf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ symbol ::=
underscore|
"."|
","|
"("|")"|"-"|":"|"#"|"/"|"'"|";"|"|"|"–"|doublequote|"!"|"%"|"?"|"_"|"—"|"+"|"$"|"~"|"·"|"’"|equals|"†"|"½"|"*"|"@"|"−"|"‘"
"("|")"|"-"|":"|"#"|"/"|"'"|";"|"|"|"–"|doublequote|"!"|"%"|"?"|"_"|"—"|"+"|"$"|"~"|"·"|"’"|equals|"†"|"½"|"*"|"@"|"−"|"‘"|"^"|"ᴥ"
{
mixin="com.mwplugin.psi.impl.MediaWikiNamedElementImpl"
implements="com.mwplugin.psi.IMediaWikiNamedElement"
Expand Down Expand Up @@ -455,7 +455,7 @@ inline-text ::=

inline-element-sans-pipe ::= ( !"|" (all-inline-elements))*

all-inline-elements ::= (letter|symbol|decimaldigit|whitespace-char|inline-element)
all-inline-elements ::= (letter|symbol|decimaldigit|whitespace-char|inline-element|special-block)

inline-element ::=
html-tag |
Expand Down Expand Up @@ -538,6 +538,7 @@ internal-link ::=
{
mixin="com.mwplugin.psi.impl.MediaWikiNamedElementImpl"
implements="com.mwplugin.psi.IMediaWikiNamedElement"
methods=[getPresentation]
}
internal-link-property ::= (variable-name "=" (content-non-pipe))
internal-link-unassigned-property ::= (whitespace? (content-non-pipe))
Expand Down Expand Up @@ -569,6 +570,7 @@ external-link ::=
{
mixin="com.mwplugin.psi.impl.MediaWikiNamedElementImpl"
implements="com.mwplugin.psi.IMediaWikiNamedElement"
methods=[getPresentation]
}

url ::= LEGAL_URL_ENTITY+//protocol url-path
Expand Down Expand Up @@ -1297,6 +1299,7 @@ section ::=
{
mixin="com.mwplugin.psi.impl.MediaWikiNamedElementImpl"
implements="com.mwplugin.psi.IMediaWikiNamedElement"
methods=[getPresentation]
}

space-tabs ::=
Expand All @@ -1306,33 +1309,34 @@ space-tabs ::=
implements="com.mwplugin.psi.IMediaWikiNamedElement"
}

level-5-heading ::= equals5 inline-text equals5
level-5-heading ::= equals5 section-name equals5 newline
level-5-section ::=
level-5-heading paragraph
level-5-heading (!level-5-heading !level-4-heading !level-3-heading !level-2-heading all-inline-elements)*
{
mixin="com.mwplugin.psi.impl.MediaWikiNamedElementImpl"
implements="com.mwplugin.psi.IMediaWikiNamedElement"
}

level-4-heading ::= equals4 inline-text equals4
level-4-heading ::= equals4 section-name equals4 newline
level-4-section ::=
level-4-heading paragraph (level-5-heading)?
level-4-heading (!level-4-heading !level-3-heading !level-2-heading all-inline-elements)* (!level-4-heading !level-3-heading !level-2-heading section)*
{
mixin="com.mwplugin.psi.impl.MediaWikiNamedElementImpl"
implements="com.mwplugin.psi.IMediaWikiNamedElement"
}

level-3-heading ::= equals3 inline-text equals3
level-3-heading ::= equals3 section-name equals3 newline
level-3-section ::=
level-3-heading paragraph (level-4-heading|level-5-heading)?
level-3-heading (!level-3-heading !level-2-heading all-inline-elements)* (!level-3-heading !level-2-heading section)*
{
mixin="com.mwplugin.psi.impl.MediaWikiNamedElementImpl"
implements="com.mwplugin.psi.IMediaWikiNamedElement"
}

level-2-heading ::= equals2 inline-text equals2
section-name ::= inline-text
level-2-heading ::= equals2 section-name equals2 newline
level-2-section ::=
level-2-heading paragraph (level-3-heading|level-4-heading|level-5-heading)?
level-2-heading (!level-2-heading all-inline-elements)* (!level-2-section section)*
{
mixin="com.mwplugin.psi.impl.MediaWikiNamedElementImpl"
implements="com.mwplugin.psi.IMediaWikiNamedElement"
Expand Down Expand Up @@ -1395,6 +1399,7 @@ table ::=
{
mixin="com.mwplugin.psi.impl.MediaWikiNamedElementImpl"
implements="com.mwplugin.psi.IMediaWikiNamedElement"
methods=[getPresentation]
}

table-parameters ::=
Expand Down
Binary file modified out/production/wikimedia/com/mwplugin/parser/MediaWikiParser.class
View file
Binary file not shown.
Binary file modified out/production/wikimedia/com/mwplugin/psi/MediaWikiTypes$Factory.class
View file
Binary file not shown.
Binary file modified out/production/wikimedia/com/mwplugin/psi/MediaWikiTypes.class
View file
Binary file not shown.
Binary file modified out/production/wikimedia/com/mwplugin/psi/MediaWikiVisitor.class
View file
Binary file not shown.
Binary file modified out/production/wikimedia/com/mwplugin/psi/impl/MediaWikiPsiImplUtil.class
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion resources/META-INF/plugin.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<lang.syntaxHighlighterFactory language="MediaWiki" implementationClass="com.mwplugin.MediaWikiSyntaxHighlighterFactory"/>
<colorSettingsPage implementation="com.mwplugin.MediaWikiColorSettingsPage"/>
<additionalTextAttributes scheme="Darcula" file="colorSchemes/MediaWikiDefault.xml"/>
<lang.psiStructureViewFactory language="MediaWiki" implementationClass="com.mwplugin.MediaWikiStructureViewFactory"/>
<lang.psiStructureViewFactory language="MediaWiki" implementationClass="com.mwplugin.structure.MediaWikiStructureViewFactory"/>
<!--<fileEditorProvider implementation="com.mwplugin.preview.MarkdownSplitEditorProvider"/>-->
<moduleConfigurationEditorProvider implementation="com.mwplugin.module.ModuleConfigurationProvider"/>
<annotator language="MediaWiki" implementationClass="com.mwplugin.MediaWikiAnnotator"/>
Expand Down
82 changes: 0 additions & 82 deletions src/com/mwplugin/MediaWikiStructureViewElement.java
View file

This file was deleted.

29 changes: 0 additions & 29 deletions src/com/mwplugin/MediaWikiStructureViewModel.java
View file

This file was deleted.

25 changes: 15 additions & 10 deletions src/com/mwplugin/mediawiki.bnf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ symbol ::=
underscore|
"."|
","|
"("|")"|"-"|":"|"#"|"/"|"'"|";"|"|"|"–"|doublequote|"!"|"%"|"?"|"_"|"—"|"+"|"$"|"~"|"·"|"’"|equals|"†"|"½"|"*"|"@"|"−"|"‘"
"("|")"|"-"|":"|"#"|"/"|"'"|";"|"|"|"–"|doublequote|"!"|"%"|"?"|"_"|"—"|"+"|"$"|"~"|"·"|"’"|equals|"†"|"½"|"*"|"@"|"−"|"‘"|"^"|"ᴥ"
{
mixin="com.mwplugin.psi.impl.MediaWikiNamedElementImpl"
implements="com.mwplugin.psi.IMediaWikiNamedElement"
Expand Down Expand Up @@ -455,7 +455,7 @@ inline-text ::=

inline-element-sans-pipe ::= ( !"|" (all-inline-elements))*

all-inline-elements ::= (letter|symbol|decimaldigit|whitespace-char|inline-element)
all-inline-elements ::= (letter|symbol|decimaldigit|whitespace-char|inline-element|special-block)

inline-element ::=
html-tag |
Expand Down Expand Up @@ -538,6 +538,7 @@ internal-link ::=
{
mixin="com.mwplugin.psi.impl.MediaWikiNamedElementImpl"
implements="com.mwplugin.psi.IMediaWikiNamedElement"
methods=[getPresentation]
}
internal-link-property ::= (variable-name "=" (content-non-pipe))
internal-link-unassigned-property ::= (whitespace? (content-non-pipe))
Expand Down Expand Up @@ -569,6 +570,7 @@ external-link ::=
{
mixin="com.mwplugin.psi.impl.MediaWikiNamedElementImpl"
implements="com.mwplugin.psi.IMediaWikiNamedElement"
methods=[getPresentation]
}

url ::= LEGAL_URL_ENTITY+//protocol url-path
Expand Down Expand Up @@ -1297,6 +1299,7 @@ section ::=
{
mixin="com.mwplugin.psi.impl.MediaWikiNamedElementImpl"
implements="com.mwplugin.psi.IMediaWikiNamedElement"
methods=[getPresentation]
}

space-tabs ::=
Expand All @@ -1306,33 +1309,34 @@ space-tabs ::=
implements="com.mwplugin.psi.IMediaWikiNamedElement"
}

level-5-heading ::= equals5 inline-text equals5
level-5-heading ::= equals5 section-name equals5 newline
level-5-section ::=
level-5-heading paragraph
level-5-heading (!level-5-heading !level-4-heading !level-3-heading !level-2-heading all-inline-elements)*
{
mixin="com.mwplugin.psi.impl.MediaWikiNamedElementImpl"
implements="com.mwplugin.psi.IMediaWikiNamedElement"
}

level-4-heading ::= equals4 inline-text equals4
level-4-heading ::= equals4 section-name equals4 newline
level-4-section ::=
level-4-heading paragraph (level-5-heading)?
level-4-heading (!level-4-heading !level-3-heading !level-2-heading all-inline-elements)* (!level-4-heading !level-3-heading !level-2-heading section)*
{
mixin="com.mwplugin.psi.impl.MediaWikiNamedElementImpl"
implements="com.mwplugin.psi.IMediaWikiNamedElement"
}

level-3-heading ::= equals3 inline-text equals3
level-3-heading ::= equals3 section-name equals3 newline
level-3-section ::=
level-3-heading paragraph (level-4-heading|level-5-heading)?
level-3-heading (!level-3-heading !level-2-heading all-inline-elements)* (!level-3-heading !level-2-heading section)*
{
mixin="com.mwplugin.psi.impl.MediaWikiNamedElementImpl"
implements="com.mwplugin.psi.IMediaWikiNamedElement"
}

level-2-heading ::= equals2 inline-text equals2
section-name ::= inline-text
level-2-heading ::= equals2 section-name equals2 newline
level-2-section ::=
level-2-heading paragraph (level-3-heading|level-4-heading|level-5-heading)?
level-2-heading (!level-2-heading all-inline-elements)* (!level-2-section section)*
{
mixin="com.mwplugin.psi.impl.MediaWikiNamedElementImpl"
implements="com.mwplugin.psi.IMediaWikiNamedElement"
Expand Down Expand Up @@ -1395,6 +1399,7 @@ table ::=
{
mixin="com.mwplugin.psi.impl.MediaWikiNamedElementImpl"
implements="com.mwplugin.psi.IMediaWikiNamedElement"
methods=[getPresentation]
}

table-parameters ::=
Expand Down
Loading

0 comments on commit 08a7a2e

Please sign in to comment.