Merge pull request #12 from vladdu/master

vladdu · web-flow · commit 76c1a2535fa6 · 2017-07-18T15:43:58.000+02:00
fix scanner issue (erlide_eclipse 305)
diff --git a/eclipse/org.erlide.kernel.common/META-INF/MANIFEST.MF b/eclipse/org.erlide.kernel.common/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Erlide Kernel
 Bundle-SymbolicName: org.erlide.kernel.common;singleton:=true
-Bundle-Version: 0.115.0.qualifier
+Bundle-Version: 0.115.1.qualifier
 Bundle-Vendor: erlide.org project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/eclipse/org.erlide.kernel.common/pom.xml b/eclipse/org.erlide.kernel.common/pom.xml
@@ -8,6 +8,6 @@
     </parent>
 
   <artifactId>org.erlide.kernel.common</artifactId>
-  <version>0.115.0-SNAPSHOT</version>
+  <version>0.115.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/eclipse/org.erlide.kernel.debugger/META-INF/MANIFEST.MF b/eclipse/org.erlide.kernel.debugger/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Erlide Kernel
 Bundle-SymbolicName: org.erlide.kernel.debugger;singleton:=true
-Bundle-Version: 0.115.0.qualifier
+Bundle-Version: 0.115.1.qualifier
 Bundle-Vendor: erlide.org project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/eclipse/org.erlide.kernel.debugger/pom.xml b/eclipse/org.erlide.kernel.debugger/pom.xml
@@ -8,6 +8,6 @@
     </parent>
 
   <artifactId>org.erlide.kernel.debugger</artifactId>
-  <version>0.115.0-SNAPSHOT</version>
+  <version>0.115.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/eclipse/org.erlide.kernel.feature/feature.xml b/eclipse/org.erlide.kernel.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.erlide.kernel.feature"
       label="Erlang IDE kernel"
-      version="0.115.0.qualifier"
+      version="0.115.1.qualifier"
       provider-name="%vendorName"
       image="erlang-64.gif">
    <install-handler/>
diff --git a/eclipse/org.erlide.kernel.feature/pom.xml b/eclipse/org.erlide.kernel.feature/pom.xml
@@ -12,7 +12,7 @@
 	</parent>
 
 	<artifactId>org.erlide.kernel.feature</artifactId>
-	<version>0.115.0-SNAPSHOT</version>
+	<version>0.115.1-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/eclipse/org.erlide.kernel.ide/META-INF/MANIFEST.MF b/eclipse/org.erlide.kernel.ide/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Erlide Kernel
 Bundle-SymbolicName: org.erlide.kernel.ide;singleton:=true
-Bundle-Version: 0.115.0.qualifier
+Bundle-Version: 0.115.1.qualifier
 Bundle-Vendor: erlide.org project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/eclipse/org.erlide.kernel.ide/pom.xml b/eclipse/org.erlide.kernel.ide/pom.xml
@@ -8,6 +8,6 @@
     </parent>
 
   <artifactId>org.erlide.kernel.ide</artifactId>
-  <version>0.115.0-SNAPSHOT</version>
+  <version>0.115.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/eclipse/org.erlide.kernel.site/pom.xml b/eclipse/org.erlide.kernel.site/pom.xml
@@ -13,5 +13,5 @@
 
 	<artifactId>org.erlide.kernel.site</artifactId>
 	<packaging>eclipse-repository</packaging>
-<version>0.115.0-SNAPSHOT</version>
+<version>0.115.1-SNAPSHOT</version>
 </project>
diff --git a/ide/apps/erlide_ide/src/erlide_ide.app.src b/ide/apps/erlide_ide/src/erlide_ide.app.src
@@ -1,6 +1,6 @@
 {application, erlide_ide,
   [
-   {vsn, "0.113.0"},
+   {vsn, "0.115.1"},
    {erlide_context, ide},
    {registered,   []},
    {applications, [kernel, stdlib, erlide_common, erlide_ide_core]},
diff --git a/ide/apps/erlide_ide_core/src/erlide_scanner.erl b/ide/apps/erlide_ide_core/src/erlide_scanner.erl
@@ -135,5 +135,5 @@ convert_tokens(Tokens) ->
                   G = case is_list(Txt) of true -> length(Txt); _ -> byte_size(Txt) end,
                   <<(kind_small(Kind)), L:24, O:24, G:24>>
           end,
-    unicode:characters_to_binary(lists:flatten([Fun(X) || X <- Tokens])).
+    list_to_binary(lists:flatten([Fun(X) || X <- Tokens])).
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{application, erlide_ide,`
`2`	`2`	`[`
`3`		`- {vsn, "0.113.0"},`
	`3`	`+ {vsn, "0.115.1"},`
`4`	`4`	`{erlide_context, ide},`
`5`	`5`	`{registered, []},`
`6`	`6`	`{applications, [kernel, stdlib, erlide_common, erlide_ide_core]},`