From fef0729223363722b6ebbf2aaaf97a41b37af5c5 Mon Sep 17 00:00:00 2001
From: Tim Blechmann <tim@klingt.org>
Date: Sat, 1 Oct 2011 13:16:04 +0200
Subject: [PATCH] scel: improvements to the scdoc integration

Signed-off-by: Tim Blechmann <tim@klingt.org>
---
 el/sclang-help.el | 45 +++++++++++++++++++++++++++++++++------------
 sc/Emacs.sc       | 12 ++++++++++++
 2 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/el/sclang-help.el b/el/sclang-help.el
index d9d692b..e30f8e9 100644
--- a/el/sclang-help.el
+++ b/el/sclang-help.el
@@ -603,28 +603,49 @@ Either visit file internally (.sc) or start external editor (.rtf)."
   (sclang-eval-string (sclang-format "Help.gui"))
   )
 
+(defvar sclang-scdoc-topics (make-hash-table :size 16385)
+  "List of all scdoc topics.")
+
+(sclang-set-command-handler
+ 'helpSymbols
+ (lambda (list-of-symbols)
+   (mapcar (lambda (arg)
+             (puthash arg nil sclang-scdoc-topics))
+           list-of-symbols)
+   ))
+
 (defun sclang-find-help-in-gui (topic)
   "Search for topic in SCDoc Help Browser"
   (interactive
    (list
-    (let ((topic (or (and mark-active (buffer-substring-no-properties (region-beginning) (region-end)))
-                     (sclang-help-topic-at-point)
-                     "Help")))
-      (completing-read (format "Help topic%s: " (if (sclang-get-help-file topic)
-                                                    (format " (default %s)" topic) ""))
-                       sclang-help-topic-alist nil t nil 'sclang-help-topic-history topic)))
+    (let ((topic (sclang-symbol-at-point)))
+      (completing-read (format "Help topic%s: " (if topic
+                                                    (format " (default %s)" topic)
+                                                  ""))
+                       sclang-scdoc-topics nil nil nil 'sclang-help-topic-history topic)))
    )
-  (sclang-eval-string (sclang-format "HelpBrowser.openHelpFor(%o)" topic))
-)
+  (if topic
+      (sclang-eval-string (sclang-format "HelpBrowser.openHelpFor(%o)" topic))
+    (sclang-eval-string (sclang-format "Help.gui"))
+    )
+  )
+
 
 ;; =====================================================================
 ;; module setup
 ;; =====================================================================
 
-(add-hook 'sclang-library-startup-hook (lambda ()
-					 (condition-case nil
-					     (sclang-index-help-topics)
-					   (error nil))))
+(add-hook 'sclang-library-startup-hook
+          (lambda ()
+            (sclang-perform-command 'helpSymbols)
+            (condition-case nil
+                (sclang-index-help-topics)
+              (error nil))))
+
+(add-hook 'sclang-library-shutdown-hook
+          (lambda ()
+            (clrhash sclang-scdoc-topics)))
+
 (add-to-list 'auto-mode-alist '("\\.rtf$" . sclang-help-mode))
 ;; ========= ADDITION for HTML help files?? ============
 ;; (add-to-list 'auto-mode-alist '("\\.html$" . sclang-help-mode))
diff --git a/sc/Emacs.sc b/sc/Emacs.sc
index 523ec1b..d4ace8f 100644
--- a/sc/Emacs.sc
+++ b/sc/Emacs.sc
@@ -197,6 +197,18 @@ EmacsInterface {
 			//	devpath.postln;
 			Document.open( devpath ).front;
 			name -> devpath
+		})
+		.put( \helpSymbols, {
+			var result = IdentitySet.newFrom(SCDoc.docMap.keys);
+			Class.allClasses.do { | class |
+				if (class.isMetaClass.not) {
+					result.add(class.name.asString);
+				};
+				class.methods.do { | method |
+					result.add(method.name.asString);
+				};
+			};
+			result.asArray
 		});
 	}
 }