Changeset 14492 for trunk/source/cocoa-ide/cocoa-editor.lisp

Timestamp:

Dec 17, 2010, 2:22:23 AM (9 years ago)

Author:

gb

Message:

Suppress some cocotron-specific warnings.
Paren highlighting seems to work on Cocotron.

File:

• trunk/source/cocoa-ide/cocoa-editor.lisp (modified) (7 diffs)

trunk/source/cocoa-ide/cocoa-editor.lisp

@@ -1116 +1116 @@
   (unless *layout-text-in-background*
     (#/setDelegate: layout +null-ptr+)
+    #-cocotron
     (#/setBackgroundLayoutEnabled: layout nil)))
 
@@ -1150 +1151 @@
 
 
-(defmethod compute-temporary-attributes ((self hemlock-textstorage-text-view))    (let* ((container (#/textContainer self))
+(defmethod compute-temporary-attributes ((self hemlock-textstorage-text-view))
+  #-cocotron
+  (let* ((container (#/textContainer self))
          ;; If there's a containing scroll view, use its contentview         
          ;; Otherwise, just use the current view.
@@ -1163 +1166 @@
          (start (ns:ns-range-location char-range))
          (length (ns:ns-range-length char-range)))
-                                                                                    #-cocotron
     (when (> length 0)
       ;; Remove all temporary attributes from the character range
@@ -1174 +1176 @@
              (hi::*current-buffer* (buffer-cache-buffer cache)))
         (multiple-value-bind (start-line start-offset)
-                             (update-line-cache-for-index cache start)
+            (update-line-cache-for-index cache start)
           (let* ((end-line (update-line-cache-for-index cache (+ start length))))
             (set-temporary-character-attributes
@@ -1180 +1182 @@
              (- start start-offset)
              start-line
-             (hi::line-next end-line))))))
-    (when (eql #$YES (text-view-paren-highlight-enabled self))
-      (let* ((background #&NSBackgroundColorAttributeName)
-             (paren-highlight-left (text-view-paren-highlight-left-pos self))
-             (paren-highlight-right (text-view-paren-highlight-right-pos self))
-             (paren-highlight-color (text-view-paren-highlight-color self))
-             (attrs (#/dictionaryWithObject:forKey: ns:ns-dictionary
-                                                    paren-highlight-color
-                                                    background))
-             (ts (#/textStorage self)))
-        (ns:with-ns-range (left-range paren-highlight-left 1)
-          (ns:with-ns-range (right-range paren-highlight-right 1)
-            (#/beginEditing ts)
-            (#/addAttributes:range: ts attrs left-range)
-            ;(#/edited:range:changeInLength: ts #$NSTextStorageEditedAttributes left-range 0)
-            (#/addAttributes:range: ts attrs right-range)
-            ;(#/edited:range:changeInLength: ts #$NSTextStorageEditedAttributes right-range 0)
-            (#/endEditing ts)))))))
+             (hi::line-next end-line)))))))
+  (when (eql #$YES (text-view-paren-highlight-enabled self))
+    (let* ((background #&NSBackgroundColorAttributeName)
+           (paren-highlight-left (text-view-paren-highlight-left-pos self))
+           (paren-highlight-right (text-view-paren-highlight-right-pos self))
+           (paren-highlight-color (text-view-paren-highlight-color self))
+           (attrs (#/dictionaryWithObject:forKey: ns:ns-dictionary
+                                                  paren-highlight-color
+                                                  background))
+           (ts (#/textStorage self)))
+      (ns:with-ns-range (left-range paren-highlight-left 1)
+        (ns:with-ns-range (right-range paren-highlight-right 1)
+          (#/beginEditing ts)
+          (#/addAttributes:range: ts attrs left-range)
+          ;;(#/edited:range:changeInLength: ts #$NSTextStorageEditedAttributes left-range 0)
+          (#/addAttributes:range: ts attrs right-range)
+          ;;(#/edited:range:changeInLength: ts #$NSTextStorageEditedAttributes right-range 0)
+          (#/endEditing ts))))))
 
 (defmethod update-paren-highlight ((self hemlock-textstorage-text-view))
@@ -1296 +1298 @@
 ;;; HI::*CURRENT-BUFFER* is bound to the buffer containing START-LINE
 ;;; and END-LINE
+#-cocotron
 (defun set-temporary-character-attributes (layout pos start-line end-line)
   (ns:with-ns-range (range)
@@ -3497 +3500 @@
                  string)
   (assume-cocoa-thread)
-  (let* ((doc (#/makeUntitledDocumentOfType:error: self #@"html" +null-ptr+)))
+  (let* ((doc #+cocotron (#/makeUntitledDocumentOfType: self #@"html")
+              #-cocotron (#/makeUntitledDocumentOfType:error: self #@"html" +null-ptr+)))
     (unless (%null-ptr-p doc)
       (#/addDocument: self doc)