Fix String >> printString, remove #importsString.

API-CHANGES.txt

@@ -9,6 +9,11 @@
   + removeElement
   + wrapJavaScript
 
+- Association >>
+  - importsString
+- String >>
+  - importsString
+
 
 0.18.2:
 

src/Kernel-Collections.js

@@ -7065,7 +7065,7 @@ $recv(aStream)._nextPutAll_("'");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["nextPutAll:"]=1;
 //>>excludeEnd("ctx");
-$recv(aStream)._nextPutAll_(self);
+$recv(aStream)._nextPutAll_(self._replace_with_("'","''"));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["nextPutAll:"]=2;
 //>>excludeEnd("ctx");
@@ -7077,10 +7077,10 @@ return self;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aStream"],
-source: "printOn: aStream\x0a\x09aStream \x0a\x09\x09nextPutAll: '''';\x0a\x09\x09nextPutAll: self;\x0a\x09\x09nextPutAll: ''''",
+source: "printOn: aStream\x0a\x09aStream \x0a\x09\x09nextPutAll: '''';\x0a\x09\x09nextPutAll: (self replace: '''' with: '''''');\x0a\x09\x09nextPutAll: ''''",
 referencedClasses: [],
 //>>excludeEnd("ide");
-messageSends: ["nextPutAll:"]
+messageSends: ["nextPutAll:", "replace:with:"]
 }),
 $globals.String);
 

src/Kernel-Collections.st

@@ -1637,7 +1637,7 @@ printNl
 printOn: aStream
 	aStream 
 		nextPutAll: '''';
-		nextPutAll: self;
+		nextPutAll: (self replace: '''' with: '''''');
 		nextPutAll: ''''
 ! !
 

src/Kernel-Infrastructure.js

@@ -1183,7 +1183,7 @@ $recv(self._sortedImportsAsArray())._do_separatedBy_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx3) {
 //>>excludeEnd("ctx");
-return $recv(stream)._nextPutAll_($recv(each)._importsString());
+return $recv(stream)._nextPutAll_($recv(each)._printString());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx3.sendIdx["nextPutAll:"]=2;
 //>>excludeEnd("ctx");
@@ -1213,10 +1213,10 @@ return $recv(stream)._nextPutAll_("}");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: [],
-source: "importsDefinition\x0a\x09^ String streamContents: [ :stream |\x0a\x09\x09stream nextPutAll: '{'.\x0a\x09\x09self sortedImportsAsArray\x0a\x09\x09\x09do: [ :each | stream nextPutAll: each importsString ]\x0a\x09\x09\x09separatedBy: [ stream nextPutAll: '. ' ].\x0a\x09\x09stream nextPutAll: '}' ]",
+source: "importsDefinition\x0a\x09^ String streamContents: [ :stream |\x0a\x09\x09stream nextPutAll: '{'.\x0a\x09\x09self sortedImportsAsArray\x0a\x09\x09\x09do: [ :each | stream nextPutAll: each printString ]\x0a\x09\x09\x09separatedBy: [ stream nextPutAll: '. ' ].\x0a\x09\x09stream nextPutAll: '}' ]",
 referencedClasses: ["String"],
 //>>excludeEnd("ide");
-messageSends: ["streamContents:", "nextPutAll:", "do:separatedBy:", "sortedImportsAsArray", "importsString"]
+messageSends: ["streamContents:", "nextPutAll:", "do:separatedBy:", "sortedImportsAsArray", "printString"]
 }),
 $globals.Package);
 
@@ -3426,39 +3426,6 @@ messageSends: ["shouldNotImplement"]
 }),
 $globals.SmalltalkImage.klass);
 
-$core.addMethod(
-$core.method({
-selector: "importsString",
-protocol: '*Kernel-Infrastructure',
-fn: function (){
-var self=this;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
-var $3,$2,$1;
-$3=$recv(self._key())._importsString();
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-$ctx1.sendIdx["importsString"]=1;
-//>>excludeEnd("ctx");
-$2=$recv($3).__comma(" -> ");
-$1=$recv($2).__comma($recv(self._value())._importsString());
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-$ctx1.sendIdx[","]=1;
-//>>excludeEnd("ctx");
-return $1;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"importsString",{},$globals.Association)});
-//>>excludeEnd("ctx");
-},
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: [],
-source: "importsString\x0a\x09\x22This is for use by package exporter.\x0a\x09It can fail for non-string keys and values.\x22\x0a\x0a\x09^ self key importsString, ' -> ', self value importsString",
-referencedClasses: [],
-//>>excludeEnd("ide");
-messageSends: [",", "importsString", "key", "value"]
-}),
-$globals.Association);
-
 $core.addMethod(
 $core.method({
 selector: "asJavaScriptPropertyName",
@@ -3529,34 +3496,6 @@ messageSends: ["at:ifAbsent:"]
 }),
 $globals.String);
 
-$core.addMethod(
-$core.method({
-selector: "importsString",
-protocol: '*Kernel-Infrastructure',
-fn: function (){
-var self=this;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx1) {
-//>>excludeEnd("ctx");
-var $1;
-$1=$recv("'".__comma(self._replace_with_("'","''"))).__comma("'");
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-$ctx1.sendIdx[","]=1;
-//>>excludeEnd("ctx");
-return $1;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx1) {$ctx1.fill(self,"importsString",{},$globals.String)});
-//>>excludeEnd("ctx");
-},
-//>>excludeStart("ide", pragmas.excludeIdeData);
-args: [],
-source: "importsString\x0a\x09\x22Answer receiver as Smalltalk expression\x22\x0a\x09^ '''', (self replace: '''' with: ''''''), ''''",
-referencedClasses: [],
-//>>excludeEnd("ide");
-messageSends: [",", "replace:with:"]
-}),
-$globals.String);
-
 $core.addMethod(
 $core.method({
 selector: "settingValue",

src/Kernel-Infrastructure.st

@@ -316,7 +316,7 @@ importsDefinition
 	^ String streamContents: [ :stream |
 		stream nextPutAll: '{'.
 		self sortedImportsAsArray
-			do: [ :each | stream nextPutAll: each importsString ]
+			do: [ :each | stream nextPutAll: each printString ]
 			separatedBy: [ stream nextPutAll: '. ' ].
 		stream nextPutAll: '}' ]
 !
@@ -941,15 +941,6 @@ new
 	self shouldNotImplement
 ! !
 
-!Association methodsFor: '*Kernel-Infrastructure'!
-
-importsString
-	"This is for use by package exporter.
-	It can fail for non-string keys and values."
-
-	^ self key importsString, ' -> ', self value importsString
-! !
-
 !String methodsFor: '*Kernel-Infrastructure'!
 
 asJavaScriptPropertyName
@@ -968,11 +959,6 @@ asSettingIfAbsent: aDefaultValue
 	^ Setting at: self ifAbsent: aDefaultValue
 !
 
-importsString
-	"Answer receiver as Smalltalk expression"
-	^ '''', (self replace: '''' with: ''''''), ''''
-!
-
 settingValue
 	^ self asSetting value
 !