From 38a4c9f0b19d59c0e70ab0fc65d6c884f31b984d Mon Sep 17 00:00:00 2001 From: fdodino Date: Thu, 23 Nov 2017 16:30:12 -0300 Subject: [PATCH] Added launcher file + several enhancements --- .../Generate WollokDoc.launch | 15 +++ .../wollok/wollokDoc/WollokDocParser.xtend | 95 +++++++++++-------- .../model/WMethodContainerExtensions.xtend | 6 +- 3 files changed, 73 insertions(+), 43 deletions(-) create mode 100644 org.uqbar.project.wollok.launch/Generate WollokDoc.launch diff --git a/org.uqbar.project.wollok.launch/Generate WollokDoc.launch b/org.uqbar.project.wollok.launch/Generate WollokDoc.launch new file mode 100644 index 0000000000..546d7838cc --- /dev/null +++ b/org.uqbar.project.wollok.launch/Generate WollokDoc.launch @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/org.uqbar.project.wollok.launch/src/org/uqbar/project/wollok/wollokDoc/WollokDocParser.xtend b/org.uqbar.project.wollok.launch/src/org/uqbar/project/wollok/wollokDoc/WollokDocParser.xtend index ba34c23bdc..64785ba141 100644 --- a/org.uqbar.project.wollok.launch/src/org/uqbar/project/wollok/wollokDoc/WollokDocParser.xtend +++ b/org.uqbar.project.wollok.launch/src/org/uqbar/project/wollok/wollokDoc/WollokDocParser.xtend @@ -29,8 +29,6 @@ import static extension org.uqbar.project.wollok.model.WollokModelExtensions.* */ class WollokDocParser extends WollokChecker { - val static HEADER_ON = "

" - val static HEADER_OFF = "

" val static HEADER2_ON = "

" val static HEADER2_OFF = "

" val static HEADER3_ON = "

" @@ -92,14 +90,13 @@ class WollokDocParser extends WollokChecker { - +
-
«generateNavbar» -
+
@@ -113,18 +110,13 @@ class WollokDocParser extends WollokChecker { file => [ allFiles.add(mainFile) val htmlFile = mainFile.name.toHtmlFile - wollokDocFile = Files.newWriter(new File(outputFolder + File.separator + htmlFile), Charsets.UTF_8) => [ - write(''' -
+ wollokDocFile = Files.newWriter(new File(outputFolder + File.separator + htmlFile), Charsets.UTF_8) + wollokDocFile + .write('''
-

«lastUpdated»

-
- ''') - ] - elements.forEach [ generateWollokDoc ] - wollokDocFile.write(''' -

«lastUpdated»

+ «elements.forEach [ generateWollokDoc ]»
+

«lastUpdated»

''') ] wollokDocFile.close @@ -134,21 +126,30 @@ class WollokDocParser extends WollokChecker { fileName.replace(WollokConstants.CLASS_OBJECTS_EXTENSION, "html") } + def String libraryName(String fileName) { + fileName.split("\\.").head + } + def String generateNavbar() { ''' -